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
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
1ecb84526f
Update brain.dm
2020-03-11 01:09:52 -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
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
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
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
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
2b4b626fac
support for items that switch states through update_icon.
2020-03-10 16:55:30 +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
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
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
39a949f223
remove that
2020-03-10 05:50:57 -07:00
e0df350579
PD now isn't a HoS taser x3 and has reasonable damage, stimulants actually combat the taser effect instead of you just being completely fucked by the HoS even through adrenals.
2020-03-10 23:21:59 +11:00
b03d83926a
Forgot the scroll
2020-03-10 20:27:40 +11:00
f41f78b162
Massively refactors martial arts, ports New Sleeping Carp
2020-03-10 20:09:31 +11:00
8a452b7f09
Food Craft Speed
2020-03-10 01:43:18 -04:00
Ghommie