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
d31075eb54
Spellcasting element
2020-03-11 16:23:30 +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
d5a6c25128
Update tablet.dm
2020-03-11 13:19:57 +01: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
8a00a15621
removed no-votes mattering more than votes (??)
2020-03-11 03:01:05 -07:00
a1f820be45
maybe check the rest of the codebase
2020-03-11 03:00:07 -07:00
1e907ac1c0
Made random's pop_antag_ratio 7 too
2020-03-11 02:58:39 -07:00
430f3decdc
Fixed dynamic runtiming in some circumstances.
2020-03-11 02:48:18 -07:00
5b46af0f88
Added a proper extended-lite.
2020-03-11 02:47:59 -07:00
8db3a3ced4
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dynamic-tweaks
2020-03-11 02:17:16 -07:00
a724de6dd8
Moved disease, revenant from midround to event.
2020-03-11 01:40:13 -07:00
f5bde6a869
Let clown ops inherit from nuke ops
2020-03-11 01:39:48 -07:00
f229e8c8fb
Enabled clown ops
2020-03-11 01:19:54 -07:00
230138d31d
Rejiggered the weights (config needs updated anyway)
2020-03-11 01:19:47 -07:00
1ecb84526f
Update brain.dm
2020-03-11 01:09:52 -07:00
bf511d0208
Made storytellers have different possible antag-per-pop goals
2020-03-10 23:39:14 -07:00
995fc09c87
Made threatening meteors more likely
2020-03-10 23:38:47 -07:00
bb45117c92
Update medicine_reagents.dm
2020-03-10 23:37:14 -07:00
621ea62d64
Added swarmers, portal storm, wormholes to dynamic.
2020-03-10 23:21:47 -07:00
c37d30a617
Some fixes requested by kev also ports a fix from tg
2020-03-11 15:43:47 +11:00
e3f6f07e73
some adjustments for now
2020-03-11 15:26:21 +11:00
3071dec0d6
probably needs a testmerge
2020-03-10 20:14:31 -07:00
18471be4ce
cult team
2020-03-10 20:11:18 -07:00
a43f9ec7be
refactor time fuck you
2020-03-10 19:57:30 -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
ce8de536b5
Merge remote-tracking branch 'citadel/master' into eldritch_affairs
2020-03-10 17:24:09 -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
27a7f754c4
Fix runtimes some more.
2020-03-10 22:40:06 +01:00
103dbe18b3
Update vote.dm
2020-03-10 22:24:27 +01:00
833841bd7b
Update others.dm
2020-03-10 16:48:33 -04:00
bd4e32e1c4
Update others.dm
2020-03-10 16:35:04 -04:00
152b3b3b51
Update posibrain.dm
2020-03-10 18:20:07 +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
Ghom