495ccc99c5
Porting some cargo/vending updates.
2020-06-08 06:12:51 +02:00
8ba5c8f690
Merge pull request #12444 from shellspeed1/Makes-internal-tanks-printable
...
Makes internal tanks printable at the engineering lathe
2020-06-08 00:37:26 +02:00
1f65381a09
Merge pull request #12463 from DeltaFire15/ling-specialrole-fuckery
...
Quick ling on_removal() fix
2020-06-08 00:35:45 +02:00
231c11a6ad
Merge pull request #12465 from Linzolle/shotgun-fix
...
shotguns no longer delete shells in their chamber after firing
2020-06-08 00:34:31 +02:00
941525c74a
Merge pull request #12462 from timothyteakettle/fix-kudzu
...
fixes spacevines
2020-06-08 00:33:51 +02:00
e4763b5f6e
let's try that again
...
more insectoid insects
2020-06-07 18:12:49 -04:00
210c873fe6
Update martyr.dm
2020-06-07 02:12:28 -07:00
7b69daffd7
Update hijack.dm
2020-06-07 02:12:12 -07:00
35abf4ffc9
Update traitor_class.dm
2020-06-07 02:11:43 -07:00
eceb46d02b
Update datum_traitor.dm
2020-06-07 02:10:28 -07:00
fe6cf2dd44
ramsay broke every shotgun
2020-06-06 14:22:23 -05:00
0cfbee9809
modifies keycard authentification devices
...
They now actually require an ID to authentificate instead of just 'access' to it.
Additionally, one can no longer initiate and confirm actions with the same ID.
2020-06-06 18:08:30 +02:00
fe39ffe033
quick oneline thing
2020-06-06 17:07:50 +02:00
994ab8ac16
fixes spacevines
2020-06-06 16:00:26 +01:00
8b406df1ec
mk III
2020-06-05 22:43:49 -04:00
6ad72e6972
better limb healing
2020-06-05 15:41:52 +01:00
0e2fb9801e
woops
2020-06-05 00:59:18 -07:00
7891c77ea9
text2num
2020-06-05 00:41:48 -07:00
ee2a2ad017
fix
2020-06-05 00:24:01 -07:00
a2d131646f
sigh
2020-06-05 00:01:02 -07:00
26b541dc42
css sucks
2020-06-04 23:41:40 -07:00
ee5b209932
eh
2020-06-04 23:27:50 -07:00
87dc0e0823
sigh
2020-06-04 23:22:17 -07:00
51a1eeb9de
sigh
2020-06-04 23:18:31 -07:00
29302c51ed
ok
2020-06-04 22:58:42 -07:00
92d1af5889
adjustments
2020-06-04 22:18:19 -07:00
a35fce64e2
fixes
2020-06-04 20:02:59 -07:00
bad809ffce
fixes
2020-06-04 19:56:06 -07:00
e80ec920e0
Moved the tanks to industrial tech node.
2020-06-04 16:42:10 -07:00
2002a273de
Makes empty internal tanks printable
2020-06-04 16:04:16 -07:00
0b0e9011a7
Prevent surgery tools and items from being rad contaminatable ( #12413 )
...
* Update tools.dm
* Update tools.dm
* Update robot_modules.dm
2020-06-04 15:56:15 -07:00
d687a04507
Fixing stationary and instrument-less song datum UIs not updating. ( #12425 )
...
* Fixing stationary and instrument-less song datums not updating.
* I forgot this one.
2020-06-04 15:53:57 -07:00
fabfd684ce
Silicon Flavortexts. (SCRUTINISE HEAVILY) ( #12395 )
...
* Part 1 - Adding the component
* Part 2 - Making the WRITE_FILE before changing the pref menu.
* Part 3 - Mirroring existing code, instead of tacking it on because im both lazy, and want a distinction
* Part 4 - Changes the preference tab to accomodate this.
* we made a brief fucky wucky!
* make it look noice
* fuckywucky mk2
* Part 5 - make it apart of the helper list (woops)
* that'yll do it.
* maybe fix?
* nope, just hit the delete button on their flavortext entirely :agony:
* Update preferences_savefile.dm
* Update silicon.dm
* Update preferences.dm
* Update silicon.dm
2020-06-04 15:53:39 -07:00
0dc57a5a96
Powers Reimagined : Void Volt ( #12433 )
...
* Void volt try 2 : Conflict boogaloo
This time with a new branch because >conflicts
* changes up some stuff
some modifications & fixes for void volt while also reorginasing the scripture tier scriptures a bit.
* Tweaks, fixes and changes
After a fuckton of localtesting, I changed around some values / fixed some stuff so it should be fine to have.
* haha yeah uh better not leave that one debug message in
oops!
2020-06-04 15:41:01 -07:00
3eb3934e26
Adds Pride Month as a holiday! ( #12436 )
...
* Adds pride month as a holiday, complete with assistants spawning with rainbow jumpsuits
* yknow what, while i'm at it, let's compress it
2020-06-04 15:40:31 -07:00
1a6bfeb0f1
Switch man bad
...
ifs in switch segments ONLY support constant expressions, NOT vars
2020-06-04 18:32:41 +02:00
1406364889
fix emps
2020-06-04 15:25:56 +01:00
b54cc8de3c
fix indentation
2020-06-04 15:09:14 +01:00
f2aa370506
make ipcs cool
2020-06-04 14:59:52 +01:00
d1a80ca2d7
Ghommie requested change
2020-06-03 20:29:17 -04:00
5e37d3ef3b
Merge pull request #12430 from Ghommie/Ghommie-cit811
...
Fixing various icons problems with some clothings.
2020-06-03 20:23:16 +00:00
1a9787a9c2
Merge remote-tracking branch 'citadel/master' into combat_rework
2020-06-02 21:49:43 -07:00
937731d77d
fix and tested
2020-06-02 21:32:36 -04:00
b62ef0f4e8
right...
2020-06-02 19:44:47 -04:00
d53dca7322
Fixing just a couple issues. ( #12417 )
2020-06-02 15:30:22 -07:00
ab3799ae7a
Ports cornrows hairstyles from yogstation ( #12423 )
2020-06-02 15:29:07 -07:00
d7954ca077
Yet another PR fixing some issues. ( #12424 )
2020-06-02 15:29:01 -07:00
0d55a387d0
Powers Remembered: Chants ( #12403 )
...
* Initial Commit: Inath-Neq's Mantra
* A Volt of Inspiration
* Bug Squash I
* Bugsquashing II
* Bugsquashing III - Now with effects added!
* Bugsquashing IV: This probably won't work!
* It worked, how about that. Numbers Tweak.
* Better Number Tweaks
Co-authored-by: The0bserver <Gizmomaster777@gmail.com >
2020-06-02 15:27:13 -07:00
07e42c079c
Fixing cards states and user-less projectiles checking mean armor values. ( #12400 )
2020-06-02 15:24:13 -07:00
ea763df326
Photosynthesis element. ( #12394 )
...
* Photosynthesis element.
* element yaketi sax.
* Ok, let's just use SSobj which has 20 wait instead of 10.
2020-06-02 15:23:09 -07:00
Ghommie