 timothyteakettle
|
0f0e0298e5
|
newline at end of file
|
2020-07-01 03:34:17 +01:00 |
|
|
timothyteakettle
|
d1f92da74a
|
20 is fine if we edit volume
|
2020-07-01 03:29:22 +01:00 |
|
|
timothyteakettle
|
4865831b6e
|
alright this is a bad meme
|
2020-07-01 03:28:37 +01:00 |
|
|
Artur
|
20245f7319
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-06-30 02:30:29 +03:00 |
|
|
Artur
|
2797aefc3a
|
Clockworkslab and ui resizing
|
2020-06-30 01:05:43 +03:00 |
|
|
Putnam3145
|
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 |
|
|
Ghom
|
b280c0f550
|
Merge pull request #12622 from timothyteakettle/grammar-fixes
big batch of spelling/grammar corrections
|
2020-06-29 21:13:06 +02:00 |
|
|
silicons
|
1d4a54d880
|
log
|
2020-06-26 23:47:16 -07:00 |
|
|
silicons
|
0df5aa083b
|
policies and code hooks
|
2020-06-26 23:41:44 -07:00 |
|
|
timothyteakettle
|
76b5557e1e
|
bunch of grammar corrections
|
2020-06-27 02:12:44 +01:00 |
|
|
Timothy Teakettle
|
9c9868438c
|
some fixes
|
2020-06-26 22:49:43 +01:00 |
|
|
Timothy Teakettle
|
334d55bef3
|
add support for custom blood colours
|
2020-06-26 20:29:40 +01:00 |
|
|
Artur
|
765ffdb1a1
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-06-26 14:03:27 +03:00 |
|
|
silicons
|
ac06f037e5
|
Merge pull request #12575 from dapnee/meme
Wataur Bottle
|
2020-06-24 08:44:08 -07:00 |
|
|
Linzolle
|
15be6217bd
|
Merge branch 'master' of github.com:Citadel-Station-13/Citadel-Station-13 into chemmaster
|
2020-06-23 20:49:12 -05:00 |
|
|
Ghommie
|
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 |
|
|
dapnee
|
e63f6aed42
|
Merge remote-tracking branch 'upstream/master' into meme
|
2020-06-22 15:15:28 -06:00 |
|
|
Artur
|
c41d2e78be
|
Conflicts!!!
|
2020-06-22 17:39:24 +03:00 |
|
|
dapnee
|
0f15b0ce84
|
hey look, I'm finished with a single meme item
hahaha
|
2020-06-21 18:49:58 -06:00 |
|
|
dapnee
|
cfff6677b4
|
wataur
hahaha, imagine if this worked
|
2020-06-21 18:14:34 -06:00 |
|
|
silicons
|
99a7c49e52
|
Merge pull request #12561 from shellspeed1/Ports-kyro-chems
Ports IV bags from TG
|
2020-06-21 14:11:10 -07:00 |
|
|
Linzolle
|
b873f244c9
|
finally
|
2020-06-19 22:46:31 -05:00 |
|
|
Timothy Teakettle
|
0d197e82f8
|
Merge branch 'master' into cool-ipcs
|
2020-06-19 01:57:02 +01:00 |
|
|
shellspeed1
|
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 |
|
|
kevinz000
|
118ac1a775
|
Merge pull request #12548 from timothyteakettle/more-events
ports several tg events including fugitives
|
2020-06-17 20:10:04 -07:00 |
|
|
Trilbyspaceclone
|
51da7dfa71
|
Merge branch 'master' into spike-loot-differentces
|
2020-06-17 02:36:52 -04:00 |
|
|
SmArtKar
|
170a38a3a7
|
Porting sutures and meshes from /TG/ (#12532)
* Porting sutures and meshes from /TG/
* Recipes fix
|
2020-06-16 16:22:56 -07:00 |
|
|
Artur
|
ceba739231
|
Cooonflicts
|
2020-06-16 01:23:42 +03:00 |
|
|
Timothy Teakettle
|
d7bce8aec0
|
ports some events
|
2020-06-15 20:22:40 +01:00 |
|
|
The0bserver
|
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 |
|
|
Ghom
|
8cb15f9279
|
Actually Balanced and Standardized Vendor Prices. (#12495)
|
2020-06-09 22:22:53 -07:00 |
|
|
Ghom
|
77a6511cc7
|
Fixing two issues. (#12481)
|
2020-06-09 03:26:19 -07:00 |
|
|
Trilbyspaceclone
|
81070b8ada
|
New fermi chem Zeolites! (#12428)
* Zeolites!
* No loner hs debug numbers...
|
2020-06-09 03:25:40 -07:00 |
|
|
Artur
|
b6dc41b852
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-06-09 11:07:39 +03:00 |
|
|
TrilbySpaceClone
|
8b406df1ec
|
mk III
|
2020-06-05 22:43:49 -04:00 |
|
|
DeltaFire
|
1a6bfeb0f1
|
Switch man bad
ifs in switch segments ONLY support constant expressions, NOT vars
|
2020-06-04 18:32:41 +02:00 |
|
|
Timothy Teakettle
|
b54cc8de3c
|
fix indentation
|
2020-06-04 15:09:14 +01:00 |
|
|
Timothy Teakettle
|
f2aa370506
|
make ipcs cool
|
2020-06-04 14:59:52 +01:00 |
|
|
coldud13
|
17d4c99b25
|
alt click to remove containers from reagent grinder and biogenerator
|
2020-06-02 19:10:41 +10:00 |
|
|
Ghom
|
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 |
|
|
Artur
|
19f215477e
|
Merge remote-tracking branch 'upstream/master' into TGUI-3.0
|
2020-05-30 18:52:02 +03:00 |
|
|
Ghommie
|
e51ac4e745
|
Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event.
|
2020-05-29 17:58:35 +02:00 |
|
|
Ghom
|
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 |
|
|
Ghom
|
07df0102f8
|
Demodularizing a few reagents, a client var, the rest hud button. (#12329)
|
2020-05-24 13:21:14 -07:00 |
|
|
Ghom
|
0a6b755eff
|
Apotechary chem dispenser nerf. (#12292)
* Apotechary chem dispenser nerf.
* Spelling and build_path.
|
2020-05-24 13:20:32 -07:00 |
|
|
Ghom
|
6756b564b7
|
Removing that one keg. (#12333)
|
2020-05-24 13:07:53 -07:00 |
|
|
Ghom
|
ba3151bf1e
|
Pills and pill bottles are now volumetric. (#12332)
|
2020-05-24 13:07:35 -07:00 |
|
|
Ghom
|
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 |
|
|
Artur
|
098b6642ae
|
Merge remote-tracking branch 'upstream/master' into TGUI-3.0
|
2020-05-22 16:19:17 +03:00 |
|
|
Lin
|
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 |
|