kevinz000
|
076b6c8699
|
Merge pull request #9077 from Sishen1542/id-boingo
No ID insertion for everything except the hop console
|
2019-09-10 22:04:48 -07:00 |
|
CitadelStationBot
|
fcce5f976f
|
Automatic changelog generation for PR #9247 [ci skip]
|
2019-09-10 12:27:43 -05:00 |
|
kevinz000
|
829a2615c5
|
Merge pull request #9247 from Thalpy/QuantFix
Partially fixes tiny runaway decimals in reagents.
|
2019-09-10 10:27:40 -07:00 |
|
kevinz000
|
8a1e097ba7
|
Merge pull request #9243 from BlackMajor/Doggo-sit
Updates dogborg sprites and some.
|
2019-09-09 17:54:19 -07:00 |
|
BlackMajor
|
7ef06427c5
|
Removes the medihound red crosses
|
2019-09-10 11:07:54 +12:00 |
|
BlackMajor
|
0b581a1ded
|
Merge branch 'master' into Doggo-sit
|
2019-09-10 11:02:57 +12:00 |
|
kevinz000
|
ef700e77d9
|
Merge pull request #9266 from BlackMajor/master
In an extremely convoluted manner, resolves a merge conflict.
|
2019-09-09 09:39:48 -07:00 |
|
BlackMajor
|
2db95cf164
|
Yes this is how github works.
|
2019-09-09 21:16:06 +12:00 |
|
BlackMajor
|
ede9716d98
|
Yeet
|
2019-09-09 21:12:40 +12:00 |
|
BlackMajor
|
9d32f5a6cd
|
Merge pull request #11 from Citadel-Station-13/master
Just updating my master
|
2019-09-09 21:11:21 +12:00 |
|
BlackMajor
|
e1e6496976
|
Me no comprendo github conflicts right now
|
2019-09-09 21:08:24 +12:00 |
|
BlackMajor
|
54edb7553a
|
Thank you github very cool
|
2019-09-09 21:02:32 +12:00 |
|
BlackMajor
|
683f46a051
|
Fuck
|
2019-09-09 20:57:32 +12:00 |
|
BlackMajor
|
574d41ff09
|
This better work
|
2019-09-09 20:55:23 +12:00 |
|
BlackMajor
|
8239f28944
|
FINE WE'LL DO IT YOUR WAY
|
2019-09-09 20:54:20 +12:00 |
|
BlackMajor
|
ce962490e3
|
Dab on merge conflict part 2
|
2019-09-09 20:52:08 +12:00 |
|
BlackMajor
|
a29fc4205f
|
Dab on merge conflict part 1
|
2019-09-09 20:51:01 +12:00 |
|
BlackMajor
|
c824f4a6fe
|
Fixes Alina's donor sprites and adjusts dark medihound to not trigger the red cross
|
2019-09-09 20:38:51 +12:00 |
|
kevinz000
|
dbb4e43c17
|
Merge pull request #9264 from Citadel-Station-13/BlackMajor-patch-1
Discord invite was invalid, updates it.
|
2019-09-08 22:18:54 -07:00 |
|
BlackMajor
|
f1fafb7f5f
|
Discord invite was invalid, updates it.
|
2019-09-09 17:17:28 +12:00 |
|
CitadelStationBot
|
97d511b0b8
|
Automatic changelog generation for PR #9249 [ci skip]
|
2019-09-08 18:49:46 -05:00 |
|
nik707
|
11846849cf
|
Merge pull request #9249 from Trilbyspaceclone/patch-224
Clean bot now cleans Cumstains, glitter, tiny glass shards and more!
|
2019-09-08 19:49:44 -04:00 |
|
nik707
|
bfbf9f2492
|
Merge pull request #9254 from Citadel-Station-13/gloria-plushie
Adds Gloria Redwood plushie as well as heichou's plushies.
|
2019-09-08 19:47:50 -04:00 |
|
CitadelStationBot
|
17e15da98e
|
Automatic changelog generation for PR #9256 [ci skip]
|
2019-09-08 18:46:10 -05:00 |
|
nik707
|
de055fe289
|
Merge pull request #9256 from Thalpy/INFINITE-FERMIES
[Consider speedmerging] Fixes the infinite clone problem.
|
2019-09-08 19:46:08 -04:00 |
|
nik707
|
42abad4c63
|
Merge pull request #9261 from Citadel-Station-13/kevinz000-patch-81
[s] fixes a bug
|
2019-09-08 14:25:22 -05:00 |
|
kevinz000
|
7843e070ff
|
Update mob.dm
|
2019-09-08 12:13:24 -07:00 |
|
Fermi
|
033057d380
|
OOPS
|
2019-09-08 02:55:40 +01:00 |
|
kevinz000
|
e793c1abcb
|
Delete plushes (2).dmi
|
2019-09-07 17:15:27 -07:00 |
|
kevinz000
|
0abef923b4
|
Add files via upload
|
2019-09-07 17:14:47 -07:00 |
|
kevinz000
|
cfdbb54245
|
Add files via upload
|
2019-09-07 17:13:59 -07:00 |
|
kevinz000
|
3e9d37e70d
|
Update plushes.dm
|
2019-09-07 17:13:21 -07:00 |
|
kevinz000
|
cd4403911b
|
Delete plushes.dmi
|
2019-09-07 17:03:27 -07:00 |
|
kevinz000
|
b8374feafd
|
Update plushes.dm
|
2019-09-07 17:03:06 -07:00 |
|
CitadelStationBot
|
ff048df797
|
Automatic changelog generation for PR #9248 [ci skip]
|
2019-09-07 13:50:36 -05:00 |
|
kevinz000
|
28aac1d779
|
Merge pull request #9248 from Trilbyspaceclone/warcrime!
NT/Synda* no longer commits war crimes back on Earth
|
2019-09-07 11:50:33 -07:00 |
|
CitadelStationBot
|
4b66c7af85
|
Automatic changelog generation for PR #9238 [ci skip]
|
2019-09-07 13:37:15 -05:00 |
|
kevinz000
|
8f577e910a
|
Merge pull request #9238 from Trilbyspaceclone/surgery_stuff
Adds two more surgerys - Embalming and Body Rejuvenation
|
2019-09-07 11:37:13 -07:00 |
|
CitadelStationBot
|
2c006004e6
|
Automatic changelog generation for PR #9229 [ci skip]
|
2019-09-07 13:35:57 -05:00 |
|
kevinz000
|
4d805331df
|
Merge pull request #9229 from Trilbyspaceclone/patch-220
Gives emags 5 more uses on buy
|
2019-09-07 11:35:55 -07:00 |
|
CitadelStationBot
|
b2a1aa54c4
|
Automatic changelog generation for PR #9089 [ci skip]
|
2019-09-07 13:35:12 -05:00 |
|
kevinz000
|
09ed526594
|
Merge pull request #9089 from Sishen1542/rapid-construction-dabvice
RCDs can be upgraded to create computer/machine frames, moved deconstruction to the upgrade tier
|
2019-09-07 11:35:09 -07:00 |
|
kevinz000
|
0f6828e76e
|
Merge pull request #9224 from kappa-sama/apeserum
traitor geneticists can now go ape
|
2019-09-07 11:27:44 -07:00 |
|
kevinz000
|
c5f3f3d7f9
|
Merge pull request #9250 from MrJWhit/abductor-spawntext
Changes Abductor Spawntext
|
2019-09-07 11:26:38 -07:00 |
|
MrJWhit
|
97072c63c8
|
Adds text to not disturb the habatat to abductor spawntext
Adds "Try not to disturb the habitat, it could lead to dead specimens." to the spawntext.
|
2019-09-07 13:52:08 -04:00 |
|
TrilbySpaceClone
|
4170da3a2e
|
missed sleepers
|
2019-09-07 04:28:39 -04:00 |
|
CitadelStationBot
|
02ae8ac889
|
Automatic changelog generation for PR #9221 [ci skip]
|
2019-09-06 18:47:50 -05:00 |
|
kevinz000
|
87cf0b971a
|
Merge pull request #9221 from Sishen1542/chappy
adds some new nullrods with some back end null rod refactors
|
2019-09-06 16:47:46 -07:00 |
|
Trilbyspaceclone
|
8c05b4a1d8
|
*poor cleanbot*
|
2019-09-06 19:20:32 -04:00 |
|
Trilbyspaceclone
|
3c38e6eb3d
|
Update cleanbot.dm
|
2019-09-06 18:49:42 -04:00 |
|