 silicons
|
c924290cd1
|
Merge pull request #12733 from TheObserver-sys/Finally,moreblorble
Slime Extractification
|
2020-07-17 17:10:32 -07:00 |
|
|
Artur
|
d0f1a805e4
|
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
|
2020-07-14 16:15:48 +03:00 |
|
|
Artur
|
5f9364c5f8
|
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
|
2020-07-13 16:20:54 +03:00 |
|
|
silicons
|
72c5c2234e
|
ok
|
2020-07-12 05:15:55 -07:00 |
|
|
Lin
|
955d9fa0cc
|
Merge pull request #12624 from Citadel-Station-13/policy
policy configuration & support hooks for clone memory disorder
|
2020-07-11 16:40:38 -05:00 |
|
|
silicons
|
00867c064c
|
Merge pull request #12715 from HeroWithYay/Drinkable_Telecrystals
Drinkable and Sell-able Telecrystals
|
2020-07-11 00:49:15 -07:00 |
|
|
The0bserver
|
db625eb93f
|
Initial Commit: Adds slimeball recipe
|
2020-07-10 23:04:25 -04:00 |
|
|
Putnam
|
a625d6562b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real
|
2020-07-08 22:02:03 -07:00 |
|
|
HeroWithYay
|
bed6f4ac91
|
Adds "Telecrystal Dust" a useless, red waste of syndicate resources that can be obtained by grinding raw telecrystals in a blender.
Also makes it so you can sell raw telecrystals at cargo 1000 points each which is also a considerable waste of TC.
|
2020-07-09 16:32:14 +12:00 |
|
|
Artur
|
280d3de6c3
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-07-07 18:37:45 +03:00 |
|
|
silicons
|
0c0bf46f7f
|
Merge pull request #12696 from Chiirno/emichemmastertweak
increased the amount of stuff the chem master can dispense from 10 to 20
|
2020-07-06 17:34:50 -07:00 |
|
|
Cirno
|
45d97b2251
|
increased the amount of stuff the chem master can dispense from 10 to 20
|
2020-07-05 11:17:37 -03:00 |
|
|
silicons
|
e9c4ac8c3c
|
Merge pull request #12658 from timothyteakettle/okay-its-bad
slightly tweaks the cooking oil damage formula
|
2020-07-04 00:11:09 -07:00 |
|
|
Artur
|
f0154f3f1c
|
conflicts!!!
|
2020-07-03 15:45:11 +03:00 |
|
|
silicons
|
d85edbf8fb
|
ok
|
2020-07-03 02:15:06 -07:00 |
|
|
Artur
|
6ee1eba56c
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-07-02 23:23:47 +03:00 |
|
|
Sonic121x
|
ea7fed0c8e
|
givme that pilltype button
Fix pill type button
|
2020-07-02 22:30:28 +08:00 |
|
|
silicons
|
e2975a44a1
|
Merge branch 'master' into policy
|
2020-07-02 01:23:19 -07:00 |
|
|
Letter N
|
b35e3f2b93
|
fix: R&D Console, Vending, and chem master
|
2020-07-01 19:07:03 +08:00 |
|
|
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 |
|
|
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 |
|
|
Artur
|
c41d2e78be
|
Conflicts!!!
|
2020-06-22 17:39:24 +03:00 |
|
|
Linzolle
|
b873f244c9
|
finally
|
2020-06-19 22:46:31 -05: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 |
|
|
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
|
77a6511cc7
|
Fixing two issues. (#12481)
|
2020-06-09 03:26:19 -07:00 |
|
|
Artur
|
b6dc41b852
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-06-09 11:07:39 +03:00 |
|
|
DeltaFire
|
1a6bfeb0f1
|
Switch man bad
ifs in switch segments ONLY support constant expressions, NOT vars
|
2020-06-04 18:32:41 +02:00 |
|
|
coldud13
|
17d4c99b25
|
alt click to remove containers from reagent grinder and biogenerator
|
2020-06-02 19:10:41 +10:00 |
|
|
Artur
|
19f215477e
|
Merge remote-tracking branch 'upstream/master' into TGUI-3.0
|
2020-05-30 18:52:02 +03: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
|
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 |
|
|
Artur
|
9d04b0835b
|
Conflicts galore
|
2020-05-21 21:08:12 +03:00 |
|
|
kevinz000
|
dfcbee5045
|
Update pandemic.dm (#12318)
|
2020-05-21 02:34:09 +02:00 |
|