c4885d81f3
Merge branch 'master' into spike-loot-differentces
2020-08-27 03:41:14 -04:00
8699ce2174
fixes a bunch of broken clickdelays ( #13218 )
...
* fixes
* fix
2020-08-25 20:58:20 +02:00
1b61a5feb2
Merge branch 'master' into spike-loot-differentces
2020-08-12 15:10:37 -04:00
467f66b2a6
Removed crocin/hexacrocin.
2020-08-08 00:46:30 -07:00
3ae10ac826
update?
2020-08-06 13:09:41 -04:00
c310b1a70e
Merge pull request #12997 from silicons/lavastaff
...
fixes medsprays, sutures/regenmesh, and lavastaves not respecting clickdelay (rip instant chemdump heal on self)
2020-08-05 19:43:38 -05:00
e1e6198140
Merge branch 'master' into spike-loot-differentces
2020-08-03 10:53:08 -04:00
20dea7e41f
fix
2020-08-01 20:45:49 -07:00
9721025582
Merge branch 'master' into wounds-part-2
2020-07-29 15:47:44 +01:00
78312c23bf
sigh
2020-07-28 21:53:07 -07:00
3ca098fe98
bugfixes
2020-07-25 00:22:24 +01:00
8360bb1a7f
section 2
2020-07-24 23:44:57 +01:00
ffd44b78ba
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
2020-07-23 10:26:03 -07:00
4d48abf3a6
fixes
2020-07-21 11:46:17 -07:00
75a2035774
Merge branch 'master' into wound-port
2020-07-21 01:10:51 +01:00
98d3ac80d9
:pika:
2020-07-20 11:25:17 -07:00
58e26c540c
merge from master
2020-07-20 10:18:44 -07:00
7094649881
don't like this
2020-07-19 11:30:55 +02:00
910869d6bf
more
2020-07-18 19:44:12 -07:00
1a040dd2a6
changes
2020-07-18 18:44:17 -07:00
1a5008fee7
Merge branch 'master' into wound-port
2020-07-18 23:06:49 +01:00
7714fcfaba
more changes
2020-07-18 01:26:38 +01:00
6ee63f66aa
whew
2020-07-07 20:48:54 -07:00
ef60068f1c
Merge pull request #12666 from timothyteakettle/more-blood-fixes
...
More blood fixes
2020-07-02 14:52:39 +02:00
84d60a455e
wow its still spelt wrong
2020-07-01 21:53:34 +01:00
1cb1b4d7e6
oh my god its not even defined right
2020-07-01 21:29:10 +01:00
311e149562
fix bloodpacks
2020-07-01 21:00:01 +01:00
ee2fedd4af
Merge pull request #12390 from Ghommie/Ghommie-cit800
...
Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event.
2020-06-29 12:44:33 -07:00
ae053a9a08
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit800
2020-06-23 03:12:49 +02:00
e63f6aed42
Merge remote-tracking branch 'upstream/master' into meme
2020-06-22 15:15:28 -06:00
0f15b0ce84
hey look, I'm finished with a single meme item
...
hahaha
2020-06-21 18:49:58 -06:00
cfff6677b4
wataur
...
hahaha, imagine if this worked
2020-06-21 18:14:34 -06:00
99a7c49e52
Merge pull request #12561 from shellspeed1/Ports-kyro-chems
...
Ports IV bags from TG
2020-06-21 14:11:10 -07:00
b490f02c78
Ports IV bags from TG
...
Ports the iv bag portion of https://github.com/tgstation/tgstation/pull/44531/files from tg.
2020-06-18 02:30:58 -07:00
51da7dfa71
Merge branch 'master' into spike-loot-differentces
2020-06-17 02:36:52 -04:00
8cb15f9279
Actually Balanced and Standardized Vendor Prices. ( #12495 )
2020-06-09 22:22:53 -07:00
81070b8ada
New fermi chem Zeolites! ( #12428 )
...
* Zeolites!
* No loner hs debug numbers...
2020-06-09 03:25:40 -07:00
8b406df1ec
mk III
2020-06-05 22:43:49 -04:00
48b327ea74
chemistry/bio bags nerf and little pill volumetric tweak. ( #12392 )
...
* chemistry bag nerf and little pill volumetric tweak.
* Yea, sure why not?
* hey.
* Kevinz review.
2020-05-31 00:54:28 -07:00
e51ac4e745
Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event.
2020-05-29 17:58:35 +02:00
85186a9714
Porting updates related to material datums. ( #12317 )
...
* Porting updates related to material datums.
* art_type
* oh oh
2020-05-25 14:21:00 -07:00
ba3151bf1e
Pills and pill bottles are now volumetric. ( #12332 )
2020-05-24 13:07:35 -07:00
ab5d65a454
Porting the BEPIS research machinery. ( #12277 )
...
* Initial B.E.P.I.S port.
* All nodes but sticky tape are in. Sweet.
* Mapping the BEPIS :DDD
* ah
* deers.
2020-05-24 13:05:15 -07:00
7c7147cb3e
Field of Vision component. ( #12075 )
...
* Hopeless WIP for vision cones.
* Core component and hooks done
* Removing clutter.
* linter bashing me for using statements as args.
* Ok.
* continue
* bring back the macro
* Configs and openspace filter.
* Chat plane, reset perspective signal, mechs/vehicles cases, machineries.
* view, viewers and spoopy ghosts.
* Renamed component, admin fun button and snowflakes robots.
* Whoopsie.
* Yikes
* test merge tweak.
* radial yaketi sax.
* Fixed tgui UIs, some messages not displayed to the target.
* Documentation and a little bugfix.
* Pulling QoL, seventh plane made in this PR.
* Fix.
* Tweaks and improvements.
* Update randomverbs.dm
2020-05-15 15:25:04 -07:00
7fb96ab0cf
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685
2020-05-12 20:06:59 +02:00
106fb6496e
Update hypospray.dm
2020-05-06 05:30:54 -04:00
b2a20d5438
reducing some prices as training wheel.
2020-05-03 05:37:04 +02:00
b383066e57
Replacing the MATERIAL_NO_EFFECTS flag with MATERIAL_EFFECTS.
2020-05-02 00:00:49 +02:00
94f014589d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685
2020-04-25 17:09:34 +02:00
42201343a9
Backward 512 compatibility removal.
2020-04-23 00:59:23 +02:00
Trilbyspaceclone