Ghom
c771471895
Merge pull request #11406 from kevinz000/minimaps
...
Ports station minimaps from Yogstation thank you monster860 you are an epic gamer
2020-03-12 14:18:39 +01:00
kevinz000
0b6c5b7960
Update twohanded.dm
2020-03-11 18:19:09 -07:00
Ghom
88bdc6d068
Merge pull request #11440 from kevinz000/master_fix
...
fixes master
2020-03-12 01:54:15 +01:00
Ghom
dbc54ab699
Update actions.dm
2020-03-12 01:47:51 +01:00
kevinz000
fa160d4c3a
Merge pull request #11434 from Citadel-Station-13/Ghommie-patch-3
...
Fixes flavor text preview on the chatbox.
2020-03-11 17:44:35 -07:00
kevinz000
db188f8681
Merge pull request #11307 from kappa-sama/patch-17
...
gets rid of fly species requirement from hulk
2020-03-11 17:43:23 -07:00
kevinz000
6127f6a453
k
2020-03-11 17:41:12 -07:00
kevinz000
14b22f0b67
Merge remote-tracking branch 'citadel/master' into minimaps
2020-03-11 17:32:15 -07:00
kevinz000
3ae8016ec8
Merge pull request #11373 from kappa-sama/supershotty
...
miner powercreep starring 150 damage pointblank shotgun
2020-03-11 17:27:22 -07:00
kevinz000
54713dc1e4
Merge pull request #11408 from necromanceranne/sleeping_carp_port
...
Refactors Martial Arts code, human_defense, and ports New Sleeping Carp
2020-03-11 17:26:33 -07:00
kappa-sama
80b17cff1f
Merge branch 'master' into patch-17
2020-03-11 20:26:13 -04:00
kevinz000
b8642c5622
Merge pull request #11424 from necromanceranne/death_coma_stuff
...
Some fakedeath fixes requested by kev also ports a fix from tg to regen coma
2020-03-11 17:24:03 -07:00
kevinz000
69c21f4b76
Merge pull request #10327 from Seris02/tggenetics
...
ports tg genetics
2020-03-11 17:01:37 -07:00
Putnam3145
480eb32c68
Merge pull request #11418 from Ghommie/Ghommie-cit615
...
Fix runtimes some more.
2020-03-11 17:01:13 -07:00
kevinz000
0d80c8c169
Merge pull request #11412 from Citadel-Station-13/Ghommie-patch-2
...
RCL inhands wires fix.
2020-03-11 17:01:01 -07:00
kevinz000
3df171cf99
Merge pull request #11414 from Citadel-Station-13/Ghommie-patch-3-1
...
Fixes mob spawners errors with posibrains.
2020-03-11 17:00:46 -07:00
Ghom
9f681e9a76
Merge pull request #11409 from necromanceranne/taser_nerf
...
Particle Defender no longer just the HoS taser but a shotgun/Stimulants protect against the tased effect.
2020-03-12 00:30:52 +01:00
Ghom
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
Ghom
e41e3a5fbb
Update banana.dm
2020-03-12 00:22:53 +01:00
Ghom
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
Ghom
77bdb9afe8
Update flavor_text.dm
2020-03-11 17:15:04 +01:00
Ghom
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
kevinz000
2bf892c482
Update bubblegum.dm
2020-03-11 08:07:37 -07:00
kevinz000
bfeb2f0952
Update hivelord.dm
2020-03-11 08:07:20 -07:00
kevinz000
2552a34c21
Update hivelord.dm
2020-03-11 08:02:33 -07:00
kevinz000
ee68e71b2a
Update bubblegum.dm
2020-03-11 08:01:34 -07:00
kevinz000
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
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
kevinz000
1ecb84526f
Update brain.dm
2020-03-11 01:09:52 -07:00
necromanceranne
c37d30a617
Some fixes requested by kev also ports a fix from tg
2020-03-11 15:43:47 +11:00
necromanceranne
e3f6f07e73
some adjustments for now
2020-03-11 15:26:21 +11: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
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
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
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
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
Ghommie
27a7f754c4
Fix runtimes some more.
2020-03-10 22:40:06 +01:00
Ghom
103dbe18b3
Update vote.dm
2020-03-10 22:24:27 +01:00
Ghom
152b3b3b51
Update posibrain.dm
2020-03-10 18:20:07 +01: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
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
