silicons
|
bcb2e16cef
|
Merge pull request #14035 from SiliconMain/baitbegone
Comments out hololocks
|
2021-01-13 16:53:01 -07:00 |
|
Lin
|
04c5d34cb6
|
Merge pull request #14015 from DeltaFire15/synth-stuffs
Tweaks some Synth damage stuff
|
2021-01-13 18:40:03 +00:00 |
|
DeltaFire
|
a9b420f68f
|
Merge pull request #14038 from Hatterhat/atomization-never-heard-of-her
an unatomic PR designed for maximizing maintainer suffering
|
2021-01-13 18:28:59 +01:00 |
|
Hatterhat
|
2042de0f19
|
sterilegauze buff
|
2021-01-12 16:13:08 -06:00 |
|
Hatterhat
|
cb40ad4764
|
atomization is cowardice actually
|
2021-01-12 16:08:17 -06:00 |
|
SiliconMain
|
2d3e24fee4
|
Update engineering.dm
|
2021-01-12 14:43:54 -06:00 |
|
Blue Wildrose
|
059d35921a
|
quit making me drop my catgirl
|
2021-01-12 13:41:23 -07:00 |
|
Lin
|
f4c4e0721b
|
Merge pull request #14012 from Citadel-Station-13/silicons-patch-6
fixes colormate last_matrix saving (again)
|
2021-01-10 19:36:47 +00:00 |
|
silicons
|
656691912e
|
Merge pull request #13965 from Xantholne/GoodNightDisky
Good Night Disky
|
2021-01-09 15:39:06 -07:00 |
|
silicons
|
fffafff5d3
|
Merge pull request #13995 from DeltaFire15/xeno-clickdelay
(Somewhat) fixes clickdelay when attacking objects.
|
2021-01-09 15:38:07 -07:00 |
|
silicons
|
22a32d25b4
|
Merge pull request #14006 from DeltaFire15/borg-shell-dupe
Attempting to complete a borg AI shell without a cell installed no longer causes issues
|
2021-01-09 15:37:45 -07:00 |
|
silicons
|
3db556b9b7
|
Merge pull request #14007 from DeltaFire15/heretic-spec-role-fix
Fixes heretic special role adding / removal
|
2021-01-09 15:37:35 -07:00 |
|
DeltaFire
|
05f7991981
|
snap
|
2021-01-09 20:37:24 +01:00 |
|
silicons
|
9fec00621e
|
Update colormate.dm
|
2021-01-09 06:43:55 -07:00 |
|
DeltaFire
|
9cfd3c073e
|
smol fix
|
2021-01-09 00:33:20 +01:00 |
|
DeltaFire
|
23c5f1744d
|
actually
|
2021-01-09 00:12:10 +01:00 |
|
DeltaFire
|
4f3df626c6
|
no cell no problem
|
2021-01-09 00:09:17 +01:00 |
|
silicons
|
1022837827
|
Update misc.dm
|
2021-01-08 01:29:20 -07:00 |
|
Putnam3145
|
5cde6e0157
|
Merge pull request #13871 from silicons/debris
Merry Christmas - GIVING JANITORS A JOB
|
2021-01-08 00:26:52 -08:00 |
|
silicons
|
407b1fe071
|
Update humans.dm
|
2021-01-07 23:14:59 -07:00 |
|
DeltaFire
|
d153d82441
|
Merge pull request #13931 from shellspeed1/porting-turret
Ports disposable sentry gun for station engineers as a traitor item from TG
|
2021-01-08 02:59:48 +01:00 |
|
DeltaFire
|
108eace16e
|
fix
|
2021-01-08 02:37:39 +01:00 |
|
silicons
|
f06a7c1ec3
|
Merge pull request #13980 from MrJWhit/first-things-first
Makes gas sensors fireproof
|
2021-01-07 17:22:41 -07:00 |
|
DeltaFire
|
d100fe1d58
|
Merge pull request #13981 from MrJWhit/caution-sign
Porting the ability to wear the caution sign (plus a random metastation fix)
|
2021-01-07 20:17:03 +01:00 |
|
DeltaFire
|
3d09edfc4b
|
Merge pull request #13978 from Citadel-Station-13/silicons-patch-3
removes c4 mob gibbing
|
2021-01-07 06:22:06 +01:00 |
|
shellspeed1
|
926b4ca609
|
Merge branch 'porting-turret' of https://github.com/shellspeed1/Citadel-Station-13 into porting-turret
|
2021-01-06 18:48:47 -08:00 |
|
shellspeed1
|
21e81faff5
|
Update traitordevices.dm
|
2021-01-06 18:48:02 -08:00 |
|
shellspeed1
|
b5e8d3308c
|
Update traitordevices.dm
|
2021-01-06 18:40:49 -08:00 |
|
silicons
|
90826aeb28
|
Update robot_parts.dm
|
2021-01-06 19:39:28 -07:00 |
|
shellspeed1
|
67364f4254
|
Update traitordevices.dm
|
2021-01-06 18:26:07 -08:00 |
|
MrJWhit
|
ba98a0aacd
|
Update miscellaneous.dm
|
2021-01-06 14:42:00 -05:00 |
|
DeltaFire
|
3f736aaa36
|
Merge pull request #13834 from zeroisthebiggay/pogbox
ports the traitor assistant POGBOX that scales damage with tc from /TG/
|
2021-01-06 19:29:17 +01:00 |
|
MrJWhit
|
abffac67b2
|
Port'n
|
2021-01-06 03:16:08 -05:00 |
|
MrJWhit
|
1cf951c4d4
|
Update atmos_control.dm
|
2021-01-06 02:38:37 -05:00 |
|
silicons
|
ab59a0d035
|
Update plastic.dm
|
2021-01-05 23:38:33 -07:00 |
|
Xantholne
|
18a336cec5
|
Adds bed tucking element
|
2021-01-05 02:47:21 -07:00 |
|
Xantholne
|
fe4f184792
|
good night disky
|
2021-01-04 03:50:43 -07:00 |
|
silicons
|
d6d753e9f7
|
Merge pull request #13959 from necromanceranne/bokken_fixes
Bokken Fixes: You can make them now. Nyoops.
|
2021-01-03 21:37:33 -07:00 |
|
necromanceranne
|
0fda694a52
|
A bunch of fixes for bokkens, renamed all references to 'ironwood' to 'steelwood', since I got confused.
|
2021-01-04 15:30:28 +11:00 |
|
silicons
|
a0d58cd18d
|
Merge pull request #13954 from EmeraldSundisk/coglocks
Cog and firelocks.
|
2021-01-03 20:19:46 -07:00 |
|
zeroisthebiggay
|
b20607cb1a
|
Update toolbox.dm
|
2021-01-03 20:18:55 -05:00 |
|
silicons
|
4c6cc24343
|
Merge pull request #13948 from necromanceranne/sheath_stuff
Bokken and Bokken Accessories: Bonkvengeance
|
2021-01-03 18:18:29 -07:00 |
|
silicons
|
0581748282
|
Merge pull request #13942 from YakumoChen/power-sink
#13925 but doesn't underestimate engineering autism
|
2021-01-03 18:09:38 -07:00 |
|
silicons
|
697619856c
|
Merge pull request #13859 from timothyteakettle/unlockable-loadout-items
unlockable loadout items
|
2021-01-03 18:07:18 -07:00 |
|
Lin
|
b3c1c69861
|
Merge pull request #13944 from Citadel-Station-13/silicons-patch-59
fixes matrix labels on colormates (swapped 1 and 2, rg is actually gr)
|
2021-01-02 16:17:24 +00:00 |
|
EmeraldSundisk
|
291c0a0a22
|
Update Space_Station_13_areas.dm
|
2021-01-01 22:46:36 -08:00 |
|
Timothy Teakettle
|
813e0f4c79
|
Merge remote-tracking branch 'upstream/master' into unlockable-loadout-items
|
2021-01-01 22:30:04 +00:00 |
|
necromanceranne
|
6a247e2a68
|
Adds a new version of bokken, cleans up some unnecessary code, completely redoes several bokken related sprites
|
2021-01-02 04:26:39 +11:00 |
|
silicons
|
78322199e3
|
fix
|
2021-01-01 00:38:46 -08:00 |
|
DeltaFire
|
a2bb761bee
|
Merge pull request #13924 from SandPoot/master
Allows mass sticking money into your id
|
2021-01-01 08:15:53 +01:00 |
|