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
b873f244c9
finally
2020-06-19 22:46:31 -05:00
0d197e82f8
Merge branch 'master' into cool-ipcs
2020-06-19 01:57:02 +01: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
118ac1a775
Merge pull request #12548 from timothyteakettle/more-events
...
ports several tg events including fugitives
2020-06-17 20:10:04 -07:00
51da7dfa71
Merge branch 'master' into spike-loot-differentces
2020-06-17 02:36:52 -04:00
170a38a3a7
Porting sutures and meshes from /TG/ ( #12532 )
...
* Porting sutures and meshes from /TG/
* Recipes fix
2020-06-16 16:22:56 -07:00
ceba739231
Cooonflicts
2020-06-16 01:23:42 +03:00
d7bce8aec0
ports some events
2020-06-15 20:22:40 +01:00
08be1292cd
It's Mad Funny when everything breaks!
...
And even funnier still when you have to start all over again!
2020-06-11 15:02:17 -04:00
8cb15f9279
Actually Balanced and Standardized Vendor Prices. ( #12495 )
2020-06-09 22:22:53 -07:00
77a6511cc7
Fixing two issues. ( #12481 )
2020-06-09 03:26:19 -07:00
81070b8ada
New fermi chem Zeolites! ( #12428 )
...
* Zeolites!
* No loner hs debug numbers...
2020-06-09 03:25:40 -07:00
b6dc41b852
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-06-09 11:07:39 +03:00
8b406df1ec
mk III
2020-06-05 22:43:49 -04:00
1a6bfeb0f1
Switch man bad
...
ifs in switch segments ONLY support constant expressions, NOT vars
2020-06-04 18:32:41 +02:00
b54cc8de3c
fix indentation
2020-06-04 15:09:14 +01:00
f2aa370506
make ipcs cool
2020-06-04 14:59:52 +01:00
17d4c99b25
alt click to remove containers from reagent grinder and biogenerator
2020-06-02 19:10:41 +10: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
19f215477e
Merge remote-tracking branch 'upstream/master' into TGUI-3.0
2020-05-30 18:52:02 +03: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
07df0102f8
Demodularizing a few reagents, a client var, the rest hud button. ( #12329 )
2020-05-24 13:21:14 -07:00
0a6b755eff
Apotechary chem dispenser nerf. ( #12292 )
...
* Apotechary chem dispenser nerf.
* Spelling and build_path.
2020-05-24 13:20:32 -07:00
6756b564b7
Removing that one keg. ( #12333 )
2020-05-24 13:07:53 -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
098b6642ae
Merge remote-tracking branch 'upstream/master' into TGUI-3.0
2020-05-22 16:19:17 +03:00
8ca1bcd237
Merge pull request #12315 from DeltaFire15/styp-silsulf-OD-fix
...
Fixes Styptic Powder & SilverSulf OD effects
2020-05-21 19:22:28 +00:00
9d04b0835b
Conflicts galore
2020-05-21 21:08:12 +03:00
dfcbee5045
Update pandemic.dm ( #12318 )
2020-05-21 02:34:09 +02:00
761d014f6f
fixes silver sulf and styptic OD effects
...
:)
2020-05-20 18:52:20 +02:00
08280a853e
Renames 'visible_atoms' and 'get_actual_viewers' procs to 'fov_view' and 'fov_viewers' ( #12282 )
...
* Renames 'visible_atoms' and 'get_actual_viewers' procs to 'fov_view' and 'fov_viewers'
* Ok, signals.
2020-05-17 17:04:15 -07:00
12ac08d7c5
Porting tesla/electrocute code updates. ( #12280 )
...
* Porting tesla/electrocute code updates.
* Why is the dominator being insta-deleted by zaps a good idea?
* Yikes.
* ah
2020-05-17 16:35:17 -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
fc0ac23eed
slight modifications to soda/booze dispenser emag reagents ( #12174 )
...
* these
* coom.
* move
* Update code/modules/reagents/chemistry/machinery/chem_dispenser.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
* Update code/modules/reagents/chemistry/machinery/chem_dispenser.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-05-14 04:27:19 +02:00
dabdf16eac
Coonflict fiiixeeess
2020-05-13 12:56:17 +03:00
5b7d9a9008
Merge conflict fix
2020-05-13 12:37:18 +03:00
86afd889f1
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real
2020-05-12 22:39:32 -07:00
4aca1e8f62
Update medicine_reagents.dm ( #12233 )
2020-05-13 04:20:05 +02:00
8458f97692
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real
2020-05-12 13:34:31 -07:00
395d434e6e
Merge pull request #12200 from Ghommie/Ghommie-cit738
...
nutrition adjustment wrapper procs from tg.
2020-05-12 12:28:02 -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
e8d7da56f4
Ported C++mos from yogs (help me)
2020-05-11 15:44:26 -07:00
667c12d413
nutrition adjustment wrapper procs.
2020-05-10 21:41:50 +02:00
c20c7f0698
Removes crocin, hexacrocin from emagged booze dispenser; makes crocin no longer "roofies" (??) ( #12177 )
...
* Removes crocin, hexacrocin from emagged booze dispenser
* what. what. what. what. what.
2020-05-09 14:34:30 +02:00
ccae3aebd5
Trying to get the sleeper and clockworkslab to work
2020-05-08 19:50:49 +03:00
aaa31c24ce
Demodularizing a few sprite assets.
2020-05-08 04:02:31 +02:00
dapnee