a08eec3f73
Automatic changelog generation for PR #12187 [ci skip]
2020-06-08 01:21:10 -05:00
881dfe81c5
Merge pull request #12187 from Trilbyspaceclone/patch-373
...
Nerfs cargo gas selling - MK different pr then the one that addresses this
2020-06-08 08:21:07 +02:00
6cf4985360
Update large_objects.dm
2020-06-08 01:09:27 -04:00
abaf633ab9
Update large_objects.dm
2020-06-08 01:09:06 -04:00
909b8f40c5
Automatic changelog compile [ci skip]
2020-06-08 00:07:59 +00:00
8532109c27
Automatic changelog generation for PR #12443 [ci skip]
2020-06-07 17:38:05 -05:00
911e45e526
Merge pull request #12443 from timothyteakettle/fix-blueprints
...
fixes dumb blueprint bug to do with noteleport
2020-06-08 00:38:02 +02:00
ec157a25b0
Automatic changelog generation for PR #12444 [ci skip]
2020-06-07 17:37:28 -05: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
c11690e490
Automatic changelog generation for PR #12463 [ci skip]
2020-06-07 17:35:49 -05:00
1f65381a09
Merge pull request #12463 from DeltaFire15/ling-specialrole-fuckery
...
Quick ling on_removal() fix
2020-06-08 00:35:45 +02:00
c5ad83da58
Automatic changelog generation for PR #12465 [ci skip]
2020-06-07 17:34:35 -05: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
2a54a62ac0
Automatic changelog generation for PR #12462 [ci skip]
2020-06-07 17:33:54 -05:00
941525c74a
Merge pull request #12462 from timothyteakettle/fix-kudzu
...
fixes spacevines
2020-06-08 00:33:51 +02:00
70b4f4a9bf
Automatic changelog generation for PR #12464 [ci skip]
2020-06-07 17:32:13 -05:00
0b0d70fca9
Merge pull request #12464 from DeltaFire15/keycard-auth-changes
...
Makes keycard authentication devices... actually authenticate keycards.
2020-06-08 00:32:10 +02:00
a9eb0ba9e5
Automatic changelog generation for PR #12478 [ci skip]
2020-06-07 11:23:17 -05:00
bc77b37892
Update README.md ( #12478 )
2020-06-07 09:23:14 -07:00
fe6cf2dd44
ramsay broke every shotgun
2020-06-06 14:22:23 -05:00
226c3e3aa2
Merge pull request #12445 from Trilbyspaceclone/patch-396
...
[s]ahaha what if flyswatters didnt heal bugs!
2020-06-06 13:06:02 -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
ed47b33241
Revert "Revert "Update ss13_genchangelog.py ( #12453 )" ( #12454 )" ( #12457 )
...
This reverts commit dffaecbad1
2020-06-06 03:04:51 -07:00
dffaecbad1
Revert "Update ss13_genchangelog.py ( #12453 )" ( #12454 )
...
This reverts commit 92213f62bb
2020-06-06 02:49:33 -07:00
92213f62bb
Update ss13_genchangelog.py ( #12453 )
2020-06-06 02:27:16 -07:00
a2c4b741ad
ahaha what if they didnt heal?
2020-06-04 21:46:38 -04: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
6db076c42f
Lowers the slowdown on snow tiles ( #12404 )
...
* Update fancy_floor.dm
* Update fancy_floor.dm
2020-06-04 15:52:30 -07:00
1d990d317e
Minimally invasive update to Omega Station. ( #12434 )
...
* Update OmegaStation.dmm
* Update OmegaStation.dmm
* Add files via upload
2020-06-04 15:44:12 -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
358c5405f0
Merge pull request #2 from Citadel-Station-13/master
...
update
2020-06-04 14:34:57 -07:00
76da796b76
Merge pull request #12441 from DeltaFire15/addiction-and-switch-torture
...
Fixes addictions.
2020-06-04 19:38:24 +02:00
1a6bfeb0f1
Switch man bad
...
ifs in switch segments ONLY support constant expressions, NOT vars
2020-06-04 18:32:41 +02:00
ee2a2a30e4
easy fix
2020-06-04 17:18:44 +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
837d011695
Merge pull request #12426 from Ghommie/Ghommie-cit810
...
The BEPIS reward disk icon state I forgot to add.
2020-06-03 20:21:22 +00:00
d53dca7322
Fixing just a couple issues. ( #12417 )
2020-06-02 15:30:22 -07:00
f926dd7f5e
Update pockets.dm ( #12421 )
2020-06-02 15:29:51 -07:00
575609ca8a
Fixing my fix for reclyclers. ( #12422 )
...
* Fixing my bad fix for the recycler.
* rework.
* Ok
2020-06-02 15:29:32 -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
CitadelStationBot