Commit Graph

23432 Commits

Author SHA1 Message Date
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
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
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
CitadelStationBot
2f3bf39450 Automatic changelog generation for PR #9227 [ci skip] 2019-08-31 20:04:56 -05:00
nik707
bd60e00924 Merge pull request #9227 from Trilbyspaceclone/spritefiddles
Fixes missing peach and peach seed sprites
2019-08-31 20:04:54 -05:00
Ghommie
4085b479d1 Fixing clockie mass recall that I apparently didn't really fix before. 2019-09-01 01:45:33 +02:00
TrilbySpaceClone
98c268d6ac fix 2019-08-31 16:58:03 -04:00
CitadelStationBot
29967f0983 Automatic changelog generation for PR #9219 [ci skip] 2019-08-31 02:09:17 -05:00
nik707
e943cf0ae8 Merge pull request #9219 from Trilbyspaceclone/patch-219
Ports "Fixes slimes not feeding #44760"
2019-08-31 02:09:15 -05:00
CitadelStationBot
2f980a9c91 Automatic changelog generation for PR #9175 [ci skip] 2019-08-31 02:06:35 -05:00
nik707
c826e1b412 Merge pull request #9175 from lolman360/master
[READY] Adds durathread jumpskirts, rolled down jumpsuits and PROBABLY FIXES SPRITES
2019-08-31 02:06:33 -05:00
nik707
7e8e32f848 idiot 2019-08-31 02:05:13 -05:00
nik707
daff8899dd retard 2019-08-31 02:04:58 -05:00
nik707
1d49765d4e Merge pull request #9218 from Citadel-Station-13/kevinz000-patch-79
improves an exploit patch
2019-08-31 01:48:20 -05:00
CitadelStationBot
0a7a875d39 Automatic changelog generation for PR #9216 [ci skip] 2019-08-31 01:37:52 -05:00
nik707
01e4e80cca Merge pull request #9216 from Trilbyspaceclone/patch-218
Fixes "Silver Core Luminescents Can Spawn "Oops" #9215"
2019-08-31 01:37:50 -05:00
lolman360
fee4209ec3 fffffffffffffffffffffffffffffffa 2019-08-31 10:16:03 +10:00
lolman360
c20bcccee8 gggggggggggggggggggggggg 2019-08-31 10:11:47 +10:00
lolman360
f2ed4c5085 Merge pull request #2 from lolman360/ddddddd
AAAAAAAAAAAAAAAAAAAAAAAAAAAA
2019-08-31 10:10:14 +10:00
lolman360
15cfcfc8c3 ffffffff 2019-08-31 10:09:37 +10:00
lolman360
689ba1246b eeeeee eeeeeee eeeeeeeeeeee 2019-08-31 10:08:31 +10:00
kevinz000
64b29e9e1f Update supermatter.dm 2019-08-30 15:22:58 -07:00
kevinz000
975b55e26d Update singularity.dm 2019-08-30 15:19:30 -07:00
kevinz000
a3917a81b0 Update energy_ball.dm 2019-08-30 15:18:22 -07:00
kevinz000
bc74ce110a Update energy_ball.dm 2019-08-30 15:17:23 -07:00