199272ca9d
Merge pull request #11410 from necromanceranne/harvesters_and_mechs
...
Ports tg#44633: Fixes blood beam oneshotting mech pilots.
2020-03-12 00:28:03 +01:00
3b102c4ef7
Merge pull request #11432 from Citadel-Station-13/kevinz000-patch-2
...
legion swarming now only applies to legions, not all of everything else that is a supertype and subtype of /hivelordbrood
2020-03-11 17:21:00 +01:00
ed92d21a0e
Merge pull request #11427 from Citadel-Station-13/kevinz000-patch-5
...
Fixes posibrain/MMI mechs not getting any mobility flags
2020-03-11 16:48:02 +01:00
2bf892c482
Update bubblegum.dm
2020-03-11 08:07:37 -07:00
bfeb2f0952
Update hivelord.dm
2020-03-11 08:07:20 -07:00
2552a34c21
Update hivelord.dm
2020-03-11 08:02:33 -07:00
ee68e71b2a
Update bubblegum.dm
2020-03-11 08:01:34 -07:00
dbcb9fec6a
Update code/modules/mob/living/brain/brain.dm
...
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-03-11 07:56:26 -07:00
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
901fd6b96b
Merge pull request #11420 from kappa-sama/patch-18
...
removes limbo courtesy of bhijn
2020-03-11 13:17:08 +01:00
1ecb84526f
Update brain.dm
2020-03-11 01:09:52 -07:00
d5ab355fe5
Update living.dm
2020-03-10 19:39:11 -07:00
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
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
fef4c82464
Update living.dm
2020-03-10 17:18:53 -07:00
c4f59b0b83
Update life.dm
2020-03-10 17:18:01 -07:00
09d39b8cbd
Update robot.dm
2020-03-10 17:17:37 -07:00
bb1480a369
Update carbon.dm
2020-03-10 17:16:33 -07:00
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
c5e4898d17
realtimeofday
2020-03-10 19:37:31 -04:00
0d7612dcf5
[s] Sanitizes ParseSong tempo.
2020-03-11 00:29:31 +01:00
d55f7aba42
Merge pull request #11401 from Trilbyspaceclone/bow_sprites
...
Gives pipe and ashen bow inhand sprites
2020-03-11 00:03:29 +01:00
103dbe18b3
Update vote.dm
2020-03-10 22:24:27 +01:00
48ff2f2cec
Merge pull request #11349 from monster860/pixel_erp
...
Pixel shifting for ERP
2020-03-10 18:01:52 +01:00
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
ddc7d5cf12
Update flavor_text.dm
2020-03-10 17:28:31 +01:00
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
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
7578d60436
flavor texts unset on randomize, yay.
2020-03-10 15:11:16 +01:00
c86124f8ed
Update human.dm
2020-03-10 14:34:17 +01:00
7ba120a8d3
lazyor
2020-03-10 14:12:11 +01:00
8caea8e83a
Ports tg#44633
2020-03-10 23:59:50 +11:00
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
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
e210f7d535
Merge pull request #11391 from Ghommie/Ghommie-cit612
...
Porting "Further update_icon splitup"
2020-03-10 05:58:17 -07:00
d3306e2eec
Merge pull request #11392 from zeroisthebiggay/hardsuithelmetsarenice
...
syndicate elite hardsuit helmet doesnt hide masks anymore
2020-03-10 05:57:27 -07:00
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
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
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
aca1d70bbb
Merge pull request #11397 from zeroisthebiggay/helmetsarenotheavy
...
syndicate contractor helmets are no longer secretly lead
2020-03-10 05:56:08 -07:00
8a452b7f09
Food Craft Speed
2020-03-10 01:43:18 -04:00
9ec222e5b4
Empowered Burger
2020-03-10 00:53:42 -04:00
bd2aa5f54b
Merge pull request #11402 from Ghommie/Ghommie-cit614
...
Porting more legcuffs / bola fixes etcetera
2020-03-09 21:01:51 -07:00
f444020741
Merge pull request #11403 from Citadel-Station-13/Ghommie-patch-1
...
[s] Ports "Fixes gibber part update"
2020-03-09 19:28:02 -07:00
17007182c9
Merge branch 'Ghommie-cit604' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit604
2020-03-09 22:42:31 +01:00
aa8dc93a5d
locate textref.
2020-03-09 22:27:27 +01:00
80eaf3be0d
Update _drone.dm
2020-03-09 22:22:38 +01:00
0400fbf8a2
Update constructs.dm
2020-03-09 22:21:32 +01:00
0587d3482d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit604
2020-03-09 21:53:22 +01:00
8e030763b6
Odd but ok?
...
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-03-09 12:38:45 -04:00
Ghom