Commit Graph

21280 Commits

Author SHA1 Message Date
Ghom
859cde2065 Update watercloset.dm 2020-03-06 05:43:31 +01:00
Ghom
5c67c71e90 Update towercap.dm 2020-03-06 05:41:49 +01:00
Ghom
b80acdfaa6 Update glass.dm 2020-03-06 05:39:18 +01:00
deathride58
ee65f070bf fixes runtime with body markings 2020-03-05 23:22:56 -05:00
Ghommie
0c4af362bc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit605 2020-03-06 04:00:36 +01:00
Ghommie
e484f72d7b Ports movespeed modifiers code updates. 2020-03-06 03:35:56 +01:00
Crystal9156
adc965d55e Fixes Chocolate Jelly Donuts
Choco Jelly Donuts's icon_state is actually jelly_choco, it /was/ jelly_choc which is incorrect as the dmi says jelly_choco
2020-03-05 20:52:09 -05:00
deathride58
2e35c09dec Merge pull request #10451 from kevinz000/mobility_flags
Mobility flags + combat rework stuff refactoring, fixes a few edge cases including the Oh Dreaded Xenomorph Hardstuns, etc etc time to break the game
2020-03-05 20:03:56 -05:00
Ghom
5e603c1cce Merge pull request #11064 from Trilbyspaceclone/more_implants
3 new arm tool set implants
2020-03-06 01:25:02 +01:00
Ghom
44a9add328 Merge pull request #11328 from Trilbyspaceclone/Hey-Teens!
Removed unused techweb var - Cargo selling of Techwebs nodes
2020-03-06 01:21:09 +01:00
Ghommie
5ae7965744 Ok. 2020-03-05 22:06:48 +01:00
Ghommie
324f75c4db Makes the thing actually work. 2020-03-05 21:41:41 +01:00
Ghommie
6de290758b Oh, yea. 2020-03-05 19:07:24 +01:00
Ghommie
2cbdae2f0a Made flavor texts into an element datum. 2020-03-05 18:46:33 +01:00
Putnam
fbb97ea9d4 Made power sink objective more feasible 2020-03-05 01:50:19 -08:00
kevinz000
5bca5690c4 ok 2020-03-05 01:00:35 -07:00
deathride58
c5109fa31a addresses review 2020-03-04 21:04:34 -05:00
Ghommie
bb7bfc04cc Replaces EXCEPTION() with stack_trace() and CRASH() 2020-03-05 01:47:04 +01:00
Ghommie
d4af57b0a9 Fixing one hell of a gibs runtime. 2020-03-05 01:02:54 +01:00
kevinz000
b718e0e0d6 fuck 2020-03-04 16:46:09 -07:00
Ghom
68273d0211 Merge pull request #11218 from Seris02/nomoreailipreading
no more ai illegal upgrades, version 2 because I forgot I made it in web browser last time
2020-03-05 00:26:12 +01:00
Ghom
5e4f8dc6a0 Merge pull request #11181 from Detective-Google/big-chode-energy
changes sausage girth from circumference -> diameter
2020-03-04 23:49:58 +01:00
Ghom
d78cdb9b37 Merge pull request #11130 from BlackMajor/SpaceRuins
Enables space ruin generation in the station z-level. Adds new ruins for the sake of station ruins.
2020-03-04 23:46:10 +01:00
Ghom
c373323690 Merge pull request #11318 from Citadel-Station-13/Linzolle-patch-1
fix nose booping
2020-03-04 23:40:54 +01:00
Ghom
9eedf8c1fb Update blob_mobs.dm 2020-03-04 23:34:59 +01:00
Ghom
ec5449b349 Merge pull request #11327 from Arturlang/dropper_fix
Fixes reagent containers transfer cycling
2020-03-04 23:17:00 +01:00
Ghommie
065a5743a0 Toy guns. 2020-03-04 22:59:55 +01:00
Ghom
17488480b1 Allows blobbernauts to drag objects (but not mobs) again. 2020-03-04 22:43:30 +01:00
TrilbySpaceClone
7e51cf9ab3 Removed unused techweb var 2020-03-04 16:30:10 -05:00
Artur
f879316b4e All it lacked is a return. 2020-03-04 23:29:08 +02:00
Ghommie
4ff63b7791 Made laser carbines and magrifles bulkier. 2020-03-04 22:28:02 +01:00
Lin
1a1e362e80 Merge pull request #11310 from Citadel-Station-13/Ghommie-patch-2
Fixing mob holders inventory slot flags (ergo they are not glasses)
2020-03-04 13:29:13 -06:00
Trilbyspaceclone
1c310f6cee Update hardsuit.dm 2020-03-04 13:01:25 -05:00
Ghom
7a2e0892d3 Merge pull request #11277 from kevinz000/sword_point
En garde! (nah just sword pointing)
2020-03-04 17:11:39 +01:00
Ghom
6dd27506e1 Merge pull request #11303 from Citadel-Station-13/kevinz000-patch-22
what the fuck you mean music line too long??
2020-03-04 17:11:12 +01:00
Ghom
a2fe9f0d23 Update toys.dm 2020-03-04 17:03:26 +01:00
Ghom
0b74bc9da3 Update twohanded.dm 2020-03-04 16:43:57 +01:00
Ghom
7c8b490cb3 Update energy.dm 2020-03-04 16:40:28 +01:00
Ghommie
60c7268e37 Also fixing bloodsucker coffins. 2020-03-04 16:29:09 +01:00
Ghommie
f2c8a7cd6f Porting a couple material datums code updates and fixes. 2020-03-04 15:59:46 +01:00
Ghom
976080d7b2 Merge pull request #11314 from KathrinBailey/Kat-Furniture
Kat Furniture! New sofas, chess pieces, nine new posters and shower curtain functionality!
2020-03-04 15:40:01 +01:00
Ghom
8c6b5b49c5 Update contraband.dm 2020-03-04 15:39:23 +01:00
KathrinBailey
11750b4fa9 removed redundant icon line 2020-03-04 14:16:27 +00:00
Ghom
df5b4ab56d Merge pull request #11321 from kevinz000/storage_components_are_bad
fixes storage closing while dragging, aka "this one line fix that i procrastinated giving a fuck about for about 9 months now"
2020-03-04 14:31:09 +01:00
kevinz000
f67fa08f0f Merge pull request #11274 from Citadel-Station-13/Ghommie-patch-5
Fixing a whoopsie with airlocks.
2020-03-04 05:58:44 -07:00
Kraseo
edfe50579e ACTUALLY fixes null runtimes + double contracts 2020-03-04 13:17:24 +01:00
Kraseo
4ac2848282 fixes contract target blacklisting 2020-03-04 12:35:36 +01:00
kevinz000
8923b7e72d minimaps 2020-03-04 01:21:16 -07:00
BlackMajor
43e77f7d3a Last few fixes. Adds arcane wand to dead wizard roid. 2020-03-04 19:12:56 +13:00
kevinz000
5e2414bd90 fix 2020-03-03 22:25:35 -07:00