CitadelStationBot
9a42101b68
Automatic changelog generation for PR #11421 [ci skip]
2020-03-11 07:17:51 -05:00
Ghom
f7674067d2
Merge pull request #11421 from Citadel-Station-13/kevinz000-patch-2
...
Fixes the "blind while not unconscious bug", alternatively, "if in doubt, assume something is coded in the worst possible way and is held together by duct tape and prayers"
2020-03-11 13:17:47 +01:00
Ghom
901fd6b96b
Merge pull request #11420 from kappa-sama/patch-18
...
removes limbo courtesy of bhijn
2020-03-11 13:17:08 +01:00
CitadelStationBot
a4855d3b18
Automatic changelog generation for PR #11385 [ci skip]
2020-03-11 07:10:27 -05:00
Ghom
5424633945
Merge pull request #11385 from bunny232/master
...
Box theatre starboard vent/scrubber fix
2020-03-11 13:10:24 +01:00
bunny232
7fe564e192
Update BoxStation.dmm
2020-03-11 06:56:17 -04:00
bunny232
d5f15874c2
Merge pull request #2 from Citadel-Station-13/master
...
update 2
2020-03-11 06:52:01 -04:00
kevinz000
d5ab355fe5
Update living.dm
2020-03-10 19:39:11 -07:00
kevinz000
46823a127b
Merge pull request #11335 from Ghommie/Ghommie-cit604
...
Made flavor texts into an element datum, appliable to every atom.
2020-03-10 17:26:20 -07:00
CitadelStationBot
2fabc0c7b5
Automatic changelog generation for PR #10702 [ci skip]
2020-03-10 19:24:51 -05:00
kevinz000
0791f22b62
Merge pull request #10702 from Ghommie/Ghommie-cit528
...
Hey, do you remember that wizard round where everyone tried arming up the nuclear bomb and we all went DELTA RED DELTA RED DELTA RED DELTA ?
2020-03-10 17:24:48 -07:00
kevinz000
fef4c82464
Update living.dm
2020-03-10 17:18:53 -07:00
kevinz000
c4f59b0b83
Update life.dm
2020-03-10 17:18:01 -07:00
kevinz000
09d39b8cbd
Update robot.dm
2020-03-10 17:17:37 -07:00
kevinz000
bb1480a369
Update carbon.dm
2020-03-10 17:16:33 -07:00
CitadelStationBot
e1a48cc91d
Automatic changelog generation for PR #11411 [ci skip]
2020-03-10 19:14:53 -05:00
kevinz000
f5fd4733e1
Merge pull request #11411 from Citadel-Station-13/Ghommie-patch-1
...
Webedit touching the MOVESPEED_ID_DAMAGE_SLOWDOWN_FLYING speed modifier: Citadel Edition.
2020-03-10 17:14:51 -07:00
kevinz000
31ed285a9e
Merge pull request #11419 from Citadel-Station-13/Ghommie-patch-3-2
...
[s] Sanitizes ParseSong tempo.
2020-03-10 17:14:38 -07:00
kappa-sama
c5e4898d17
realtimeofday
2020-03-10 19:37:31 -04:00
Ghom
0d7612dcf5
[s] Sanitizes ParseSong tempo.
2020-03-11 00:29:31 +01:00
CitadelStationBot
6757eece5c
Automatic changelog generation for PR #11401 [ci skip]
2020-03-10 18:03:32 -05:00
Ghom
d55f7aba42
Merge pull request #11401 from Trilbyspaceclone/bow_sprites
...
Gives pipe and ashen bow inhand sprites
2020-03-11 00:03:29 +01:00
CitadelStationBot
a834c0b184
Automatic changelog generation for PR #11417 [ci skip]
2020-03-10 16:52:32 -05:00
Putnam3145
759b7a434f
Merge pull request #11417 from Citadel-Station-13/Ghommie-patch-3
...
One liner fixing dynamic voting resulting in the unstartable gamemode.
2020-03-10 14:52:29 -07:00
Ghom
103dbe18b3
Update vote.dm
2020-03-10 22:24:27 +01:00
CitadelStationBot
3f707a61f2
Automatic changelog generation for PR #11349 [ci skip]
2020-03-10 12:01:55 -05:00
Ghom
48ff2f2cec
Merge pull request #11349 from monster860/pixel_erp
...
Pixel shifting for ERP
2020-03-10 18:01:52 +01:00
Ghom
aaf494c66b
Update code/modules/mob/mob_defines.dm
...
Co-Authored-By: kevinz000 <2003111+kevinz000@users.noreply.github.com >
2020-03-10 17:37:39 +01:00
Ghom
ddc7d5cf12
Update flavor_text.dm
2020-03-10 17:28:31 +01:00
CitadelStationBot
4cc1fdadd4
Automatic changelog generation for PR #11399 [ci skip]
2020-03-10 10:59:58 -05:00
Ghom
424a3d9668
Merge pull request #11399 from Seris02/lizardtailfixes
...
normalising wagging tail names for a very specific bug fix
2020-03-10 16:59:55 +01:00
CitadelStationBot
ef1fc6b6aa
Automatic changelog generation for PR #11398 [ci skip]
2020-03-10 10:59:41 -05:00
Ghom
abd2be036e
Merge pull request #11398 from Citadel-Station-13/kevinz000-patch-7
...
fixes hands free actions (like !!!adrenal implants!!!) not being available during stuns
2020-03-10 16:59:38 +01:00
Ghommie
7578d60436
flavor texts unset on randomize, yay.
2020-03-10 15:11:16 +01:00
Ghom
c86124f8ed
Update human.dm
2020-03-10 14:34:17 +01:00
Ghommie
7ba120a8d3
lazyor
2020-03-10 14:12:11 +01:00
kevinz000
3d6c82cbc8
Merge pull request #11381 from Citadel-Station-13/Ghommie-patch-2
...
Something about layers.
2020-03-10 05:59:36 -07:00
CitadelStationBot
5d475b4537
Automatic changelog generation for PR #11388 [ci skip]
2020-03-10 07:59:27 -05:00
kevinz000
832d894e92
Merge pull request #11388 from Owai-Seek/crabby-patty-3/1/20
...
Food Ports / Butter Bear / Food Craft Speed
2020-03-10 05:59:24 -07:00
CitadelStationBot
d837476389
Automatic changelog generation for PR #11390 [ci skip]
2020-03-10 07:58:46 -05:00
kevinz000
41fdaae32c
Merge pull request #11390 from zeroisthebiggay/ghosthudstaketwo
...
makes ghost hud default to on and ghost darkness defaults to on
2020-03-10 05:58:43 -07:00
kevinz000
e210f7d535
Merge pull request #11391 from Ghommie/Ghommie-cit612
...
Porting "Further update_icon splitup"
2020-03-10 05:58:17 -07:00
CitadelStationBot
40e470cba2
Automatic changelog generation for PR #11392 [ci skip]
2020-03-10 07:57:29 -05:00
kevinz000
d3306e2eec
Merge pull request #11392 from zeroisthebiggay/hardsuithelmetsarenice
...
syndicate elite hardsuit helmet doesnt hide masks anymore
2020-03-10 05:57:27 -07:00
kevinz000
3eac86cf31
Merge pull request #11394 from Citadel-Station-13/Ghommie-patch-3
...
Actually fixing that one overlay.
2020-03-10 05:57:18 -07:00
CitadelStationBot
04c5a5a83b
Automatic changelog generation for PR #11395 [ci skip]
2020-03-10 07:56:59 -05:00
kevinz000
1b7eaf48eb
Merge pull request #11395 from Citadel-Station-13/Ghommie-patch-4
...
Shuttle timer display seconds fix
2020-03-10 05:56:56 -07:00
kevinz000
bfb75eb26b
Merge pull request #11396 from Ghommie/Ghommie-cit613
...
Ports "Switches out the three billion args of electrocute act for flags"
2020-03-10 05:56:28 -07:00
CitadelStationBot
040c84b55f
Automatic changelog generation for PR #11397 [ci skip]
2020-03-10 07:56:10 -05:00
kevinz000
aca1d70bbb
Merge pull request #11397 from zeroisthebiggay/helmetsarenotheavy
...
syndicate contractor helmets are no longer secretly lead
2020-03-10 05:56:08 -07:00
