Commit Graph

24328 Commits

Author SHA1 Message Date
PJBot
6d2c086458 Automatic changelog update 2023-11-09 18:43:21 -05:00
Genkail
fdf4ea10f9 Generators were discharged in the admin arena (#21549)
Generators were discharged in the admin arena,
2023-11-09 16:42:31 -07:00
PixelTK
02584a5224 strip fix (#21552) 2023-11-09 16:42:16 -07:00
PJBot
977cced67f Automatic changelog update 2023-11-09 18:15:12 -05:00
Nemanja
ac5e9cd70b Fix borg mobstates (#21307)
* Add dead states to borgs

* this?

* ack
2023-11-09 16:14:06 -07:00
PJBot
4de0cf66d7 Automatic changelog update 2023-11-09 17:23:54 -05:00
Emisse
5d46bbb615 Minor Borg Qol (#21548)
* boirg stuff

* gaming

* modules shits

* mini welder is too lmao

* pro

* cheaper recipes, fix mob state thresholds, remove silly crayon, rename module

* generic borg 6 module

* literacy module shityourself
2023-11-09 15:22:50 -07:00
themias
5cc157e594 Mark space glue and lube TrashOnSolutionEmpty (#21550) 2023-11-09 17:10:20 -05:00
PJBot
1ae210f856 Automatic changelog update 2023-11-09 07:25:04 -05:00
ravage
c2de7ec5b3 Adding a kitten (#20726)
* Update animals.yml

* Update

* ANOTHER UPDATE

change mobcat meleeweapon from brute to piercing, deleting extra lines

* oops

* Update npc.yml

* Update npc.yml

* Update animals.yml
2023-11-09 05:24:00 -07:00
PJBot
7b06e1ef09 Automatic changelog update 2023-11-09 04:20:03 -05:00
Vasilis
2f2d237f86 LOOC will appear on top of your head (#21514)
* Oh well

* Minor fixing up

* HOLY BINGLE I DID IT

* TOGGLE!
2023-11-09 02:18:58 -07:00
pewter-wiz
e355541c04 Minor: Revert removal of "Oye" from dwarven accent in favour of "Oi" (#21547)
* Remove bad substitutions from dwarf accent

As per discussion in https://discord.com/channels/310555209753690112/1170959598153375815
These phrases are common pain-points
and often don't make gramatical sense
in most conversation

I feel accents (especially ones tied to species)
should favour intelligibility over flavour
where the trade-off arises

* Remove duplicate entry in dwarven accent

For -> fer already exists at accent-dwarf-words-82

* Revert removal of Hey -> Oye, opting for Hey -> Oi instead

* Revert removal of Hey -> Oye, opting for Hey -> Oi instead
2023-11-09 02:18:39 -07:00
pewter-wiz
88a9dce398 Tweak dwarf accent (#21522)
* Remove bad substitutions from dwarf accent

As per discussion in https://discord.com/channels/310555209753690112/1170959598153375815
These phrases are common pain-points
and often don't make gramatical sense
in most conversation

I feel accents (especially ones tied to species)
should favour intelligibility over flavour
where the trade-off arises

* Remove duplicate entry in dwarven accent

For -> fer already exists at accent-dwarf-words-82
2023-11-08 22:12:23 -05:00
PJBot
50e358ae90 Automatic changelog update 2023-11-08 20:55:10 -05:00
DoubleRiceEddiedd
2ef29fb222 New crop: Cotton (#21536)
* Add cotton plant

* Adddescription and tag to cotton bal allow moth eat it

* Fix typo. Add cotton seed into MegaSeed

* Fix typo

* Fix typo

* Fix cottonbol component typo

* Fix the amount of cotton that bol gives

* Adding correct component to make cotton bol edible

* Change cotton bol parent to see if it is edible

* Adding flavor to cotton bol, and fix typo

* Replace image

* fixing plant image position

* Increase the Megaseed restock crate price to avoid money farming loop hole
2023-11-08 18:54:07 -07:00
PJBot
cb1e79928e Automatic changelog update 2023-11-08 20:44:46 -05:00
themias
c1791eb65d Fix space vault (#21541) 2023-11-08 18:43:43 -07:00
brainfood1183
8be97a20c5 Roller Skates fixes (#21542) 2023-11-08 18:43:27 -07:00
PJBot
be8e5b7a8d Automatic changelog update 2023-11-08 20:43:11 -05:00
themias
cf6eb200be Remove need to toggle vending machine button (#21543) 2023-11-08 18:42:07 -07:00
Boaz1111
4220b098a3 Sling Resprites (#21538)
* DB texture on back changed

* cheese

* test

* CR20 Syndie Sling

* NT slings implemented

* finished SMGS, starting on Laser Weapons

* added more laser slings

* laser weapons done

* small changes to laser weapons and pie cannon slings

* added chinalake and l6 slings

* finished launcher catagory, almost finished rifle catagory

* almost done, just missing the heavy sniper

* Replaced L6, Chinalake and Heavy Sniper resprite because my old heavy sling was ugly af

* all slings done

* added copyright to the .meta files

* Revert "cheese"

This reverts commit a1f7ac7b70709a6789a7b6fc0dc00a2c0734b83a.

* fixed sln file, in theory at least
2023-11-08 14:18:33 -07:00
PJBot
174aa3bf62 Automatic changelog update 2023-11-08 15:32:28 -05:00
KingFroozy
3f4d9983e3 nitrile gloves (#21509) 2023-11-08 13:31:24 -07:00
PJBot
4831f2aebb Automatic changelog update 2023-11-08 15:25:40 -05:00
Ps3Moira
a466a9ef1e Grill Resprite (#21524) 2023-11-08 13:24:36 -07:00
Brandon Hu
52508a64cc Fixed typo "tranexmic -> tranexamic" (#21537) 2023-11-08 13:23:58 -07:00
Morb
55c6c35aed Fix O id prototype (#21534) 2023-11-08 13:23:02 -07:00
Vasilis
6550f42732 Common spelling mistake (#21535) 2023-11-08 13:22:46 -07:00
PJBot
e8a47cd0c5 Automatic changelog update 2023-11-08 15:19:57 -05:00
PixelTK
52af546267 Arachnid 2: Episode 2 (#19984)
* Shield

* minor sprite changes and buffs

* structure buff

* Crafting stuff

* tweaks

* 88-88

* Better web pocket sprites.

* yeah it's fine now.
2023-11-08 12:18:52 -08:00
DrSmugleaf
b360391795 Update Robust to v177.0.0 (#21528) 2023-11-08 00:30:16 -08:00
Gotimanga
8f72e0a415 Add Spawners (#20495) 2023-11-07 18:36:44 -07:00
PJBot
e249aba1f9 Automatic changelog update 2023-11-07 20:32:49 -05:00
Darkie
b5e88901eb Adding damage visuals for directional windows (#21194)
* Added a crack overlay for directional windows. Added directional window crack components to windows, reinforced windows, plasma windows and reinforced plasma windows.

* Changed the copyright information with the files I actually used.

* Updated the copyright further.
2023-11-07 18:31:45 -07:00
Leon Friedrich
ac25dd85fc Fix mob state error (#21431) 2023-11-07 18:30:05 -07:00
PJBot
33f211bdf7 Automatic changelog update 2023-11-07 20:29:43 -05:00
FluidRock
2f296dcc0a Allows reptilians to eat crayons, as is their right (#21420) 2023-11-07 18:28:36 -07:00
KingFroozy
932c5db8f5 content (#21505) 2023-11-07 18:28:15 -07:00
Vasilis
490ebdc9ae No more passive zombies (#21506) 2023-11-07 18:27:49 -07:00
PJBot
fb7afe454a Automatic changelog update 2023-11-07 20:26:48 -05:00
brainfood1183
d8a88d09a7 Origin Station Update 06.11.2023 (notice boards and gasgiant parallax) (#21492) 2023-11-07 18:26:22 -07:00
Nemanja
94368f1f00 Speed Boots [Tier 3 Civ-Service] (#21438)
* Speed Boots

* validate

* monkey
2023-11-07 18:25:43 -07:00
PJBot
a6985e5b4b Automatic changelog update 2023-11-07 20:25:33 -05:00
DrSmugleaf
3953257b7a Add method to clear an action's cooldown (#21517) 2023-11-07 18:24:43 -07:00
Vasilis
45ddc3046a Make the cloning pod and medical scanner fit through verical doors (#21519)
* Unfatten the machines

* This actually works better
2023-11-07 18:24:25 -07:00
Vasilis
104300b8c6 uwu (#21521) 2023-11-07 18:24:05 -07:00
Repo
b1fd3137e1 Minor rule change to include disability slurs in rules (#21518)
* Revert "Enable skeletons temporarily for Halloween (#21356)"

This reverts commit 4f81a561ae.

* Rule modification for slurs
2023-11-07 17:54:42 -06:00
PJBot
201fe5fd71 Automatic changelog update 2023-11-07 18:39:27 -05:00
Tunguso4ka
c90316dfbd Lockers for clown, mime and NT Representative (#21504)
* clown, mime, blue shield and NT representative now have own lockers. Will it be merged? You`l see it in the next 3-4 days. Stay tuned in.

* blue... shield? never heard of him before.
2023-11-07 18:38:18 -05:00