Commit Graph

23473 Commits

Author SHA1 Message Date
Linzolle
64b757f404 refactor suits 2019-09-07 17:10:10 -05:00
Linzolle
20ea620e9e literally why even 2019-09-07 16:46:25 -05: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
CitadelStationBot
ab8d7ec4a6 Automatic changelog generation for PR #9242 [ci skip] 2019-09-06 13:45:58 -05:00
kevinz000
e71dad4ecc Merge pull request #9242 from kappa-sama/bootcult
cultist boot cultist boot?
2019-09-06 11:45:56 -07:00
CitadelStationBot
a521e3307b Automatic changelog generation for PR #9239 [ci skip] 2019-09-06 13:45:23 -05:00
kevinz000
4b0505f691 Merge pull request #9239 from Trilbyspaceclone/patch-222
Nerfs earths blood stam regen from 30  - > 13
2019-09-06 11:45:21 -07:00
TrilbySpaceClone
a91eb608cd All of the objects 2019-09-06 13:56:10 -04:00
TrilbySpaceClone
c4f99adc3c Revert "No more!"
This reverts commit 9cc7f08668.
2019-09-06 12:18:50 -04:00
TrilbySpaceClone
9cc7f08668 No more! 2019-09-05 18:56:46 -04:00
nik707
80e2f6e7c2 Merge pull request #9245 from jakeramsay007/GLASS-MACHINE-BROKE
[SPEEDMERGE] Glass Machine :b:roke
2019-09-05 10:43:05 -05:00
Chayse Ramsay
0cf1415969 [SPEEDMERGE] Glass Machine :b:roke 2019-09-05 16:28:18 +01:00
nik707
d8dee76d28 Merge pull request #9222 from Citadel-Station-13/kevinz000-patch-80
TK dusting now uses the proper removal procs to prevent bugs
2019-09-04 20:14:06 -05:00
kappa-sama
364d05e2b7 paxton going ape 2019-09-04 20:48:46 -04:00
kappa-sama
599634496e paxton told me to do this or else he'd go ape 2019-09-04 20:46:50 -04:00
nik707
586eb56977 Merge pull request #9230 from Ghommie/Ghommie-cit191
Fixing clockie mass recall that I apparently didn't really fix correctly before.
2019-09-04 19:45:19 -05:00
kappa-sama
876232c1bc cultist boot cultist boot? 2019-09-04 20:38:51 -04:00
Trilbyspaceclone
dbdaae83b6 Update medicine_reagents.dm 2019-09-04 13:29:58 -04:00
TrilbySpaceClone
084b37ae4e tada 2019-09-04 10:13:32 -04:00
Sishen
d431ee1a20 baseball bat 2019-09-04 03:01:47 -04:00
CitadelStationBot
f742a34fb0 Automatic changelog generation for PR #9235 [ci skip] 2019-09-03 16:50:17 -05:00
kevinz000
2b251d0f5a Merge pull request #9235 from YakumoChen/autoscan-autoban-revengeance
Nerfs Autocloning Pt. 2.1: Autoscan
2019-09-03 14:50:15 -07:00
YakumoChen
807f7f4771 completely removes autoscan as originally intended 2019-09-03 06:03:46 +00:00
YakumoChen
fbcce02f78 still removes autoscan 2019-09-03 05:44:51 +00:00
CitadelStationBot
c7941fda58 Automatic changelog generation for PR #9209 [ci skip] 2019-09-02 18:37:44 -05:00
nik707
44c15897c7 Merge pull request #9209 from Sishen1542/ass-ass-ass
Adds support for trit, bz, and pluox to the SM
2019-09-02 18:37:42 -05:00
CitadelStationBot
024c44255a Automatic changelog generation for PR #9212 [ci skip] 2019-09-02 18:37:24 -05:00
nik707
2fe5571887 Merge pull request #9212 from dapnee/plasmaglass-tables-spears
Plasmaglass Tables, Spears, Shards (Take 2)
2019-09-02 18:37:22 -05:00
nik707
67f4276aab Merge pull request #9104 from Sishen1542/tbaton
classic & telebaton no longer have attack delay
2019-09-02 18:35:56 -05:00
nik707
ca8166f940 Merge pull request #9041 from Citadel-Station-13/kevinz000-patch-68
Buffs cult/clockcult wall explosion_block
2019-09-02 18:28:05 -05:00
CitadelStationBot
5e04cc2409 Automatic changelog generation for PR #9057 [ci skip] 2019-09-02 18:27:06 -05:00
nik707
dd7907c3d7 Merge pull request #9057 from EgoSumStultus/male-AI-vox
Adds the Male AI vox voice.
2019-09-02 18:27:03 -05:00
CitadelStationBot
2f42202f5c Automatic changelog generation for PR #8649 [ci skip] 2019-09-02 18:25:32 -05:00
nik707
3ea520d443 Merge pull request #8649 from Ghommie/Ghommie-cit50
Increases the default space ruin z-level count to 2
2019-09-02 18:25:30 -05:00
CitadelStationBot
bddaafe7de Automatic changelog generation for PR #8932 [ci skip] 2019-09-02 18:23:49 -05:00
nik707
df324b7f9a Merge pull request #8932 from EmeraldSundisk/gunrangebox
Adds a gun range to Box Station.
2019-09-02 18:23:48 -05:00
nik707
238faae042 Merge pull request #8919 from Citadel-Station-13/kevinz000-patch-47
Increases click resolution to 0.5 seconds
2019-09-02 18:23:34 -05:00