96834bc517
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-20 03:36:17 -05:00
088bc484e3
Forensics re-destroyed, but better this time.
...
All lists are LAZYINITLIST, cleaning code is preserved, examine is preserved. We should be back in buisness, but this is just a 'holy fuck finally' commit
2019-08-17 02:43:59 -05:00
7d12535ead
thanks paxxy boi
2019-08-17 12:18:18 +10:00
264cbf8108
reverts the add_blood back to add_blood_DNA
2019-08-15 12:49:10 -05:00
0290a46ddc
Impliments Ghom review, reverts blood list back to component
2019-08-15 12:32:44 -05:00
aa71a39fa8
so basically im monky
2019-08-11 11:13:38 +10:00
283b5d050e
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-08 16:51:53 -05:00
9ec56077b6
Merge pull request #8908 from Ghommie/Ghommie-cit142
...
Fixes Zelus flasks a bit.
2019-08-05 00:54:43 -07:00
86a2d917e5
Merge pull request #8913 from Trilbyspaceclone/clockstoles
...
Makes brass/bronze bar stools and stools - Same as normal ones
2019-08-05 00:45:56 -07:00
27b3cb6656
Merge pull request #9018 from Ghommie/Ghommie-cit171
...
Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"
2019-08-04 19:04:59 -07:00
3499d73f6b
Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods
2019-07-31 19:24:39 -05:00
ec2a3ea778
Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"
2019-07-31 18:56:00 +02:00
bbb380e043
Update medical.dm
2019-07-31 09:03:27 -04:00
589cdae0e1
Towels
2019-07-18 00:03:49 +02:00
ba63926905
Sitting on the job
2019-07-16 22:42:57 -04:00
0d1988b6be
More fixes.
2019-07-16 16:10:16 +02:00
75a8cbcc39
Makes Zelus flasks a subtype of bottle.
2019-07-16 15:39:30 +02:00
54c28b19af
Zelus indeed
2019-07-10 02:29:42 -04:00
d218739bf8
Merge pull request #8740 from Ghommie/Ghommie-cit87
...
ports "More variety for dorms bedsheets" + 3 new bed sheets.
2019-07-08 18:06:11 -04:00
fd68236594
ports "More variety for dorms bedsheets" + 3 new bed sheets.
2019-06-24 05:54:14 +02:00
2e30b91567
Ports in microwave updates and its radial menu.
2019-06-23 06:10:49 +02:00
27d7dc430f
Merge pull request #8497 from BurgerLUA/Clockwork-Reflectors
...
Adds Clockwork Reflectors
2019-06-16 19:41:57 -07:00
ab565d2483
Merge pull request #8547 from Ghommie/Ghommie-cit29
...
Moves traits to datums and turn the accessors into defines
2019-06-08 01:22:16 -07:00
d3d2b8d898
should be ready.
2019-06-06 19:24:20 +02:00
1f1f951924
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-06-03 05:35:52 -05:00
aaaebe625b
old file fixes
2019-05-31 18:00:00 -04:00
3891cf1ff6
Update sheet_types.dm
2019-05-31 17:54:49 -04:00
5f94441cc7
Adds Clockwork Reflectors
2019-05-30 22:52:43 -07:00
070e43ca64
Update sheet_types.dm
2019-05-25 17:58:33 -04:00
ed974bdcde
Update sheet_types.dm
2019-05-25 17:18:40 -04:00
971ddef989
reverts forensics components. If I can't figure it out, MURDER IT
2019-05-22 04:10:29 -05:00
4aba11739b
Finishing touches.
2019-05-10 19:15:42 -07:00
d97bf47b95
Added
2019-05-10 18:12:36 -07:00
d8312ec5ae
Medical belt overlays + hypo storage
2019-04-04 18:38:34 -05:00
7db87db43a
fancier throws, fancier bullet casings, fancier window destruction, fancier bottle smashing ( #7997 )
2019-02-13 21:02:00 -08:00
1034a6ad0e
ball stuff
2018-12-16 03:41:37 -08:00
629189fdc1
Added Another new carpet, and two tables, and a new cargo crate.
...
Added: monochrome. Two new table sprites for the other new carpet. New cargo supply crate for the two new carpets. Changed: the name of the new carpet to "blackred" so it would avoid confusion with the original carpet.
2018-12-07 22:48:46 -06:00
e339bcd2ca
Added a new carpet
...
Worked on adding a new carpet. It isn't -finished- yet and Trilby is going to help look over what I've done so I can make this work.
2018-12-01 20:21:18 -06:00
42db44b39e
Alien Ruin fix, various cherrypicked upstream fixes
...
Also adds new buildmode
2018-09-13 22:55:11 -05:00
8b9ef1e400
Game folder
2018-09-11 04:06:45 -05:00
3e18d8208e
Updates to tgstation commit 78e471d
2018-07-05 01:22:27 -04:00
91805b8789
and that just leaves the modules folder
2018-07-02 00:28:51 -04:00
a6cfd22b79
Fixes gulag stacker not giving points after RPG loot event ( #38570 )
...
* Fixes gulag stacker not giving points after RPG loot event
* Moves point values to type vars
* cleanup
2018-06-21 16:30:39 -05:00
4ae974644c
Standardizes and cleans up some admin messages & logging
2018-05-31 22:41:31 -05:00
2f9e3e403d
Hard upstream sync ( #6951 )
...
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync
* sync part 1 - underscore folders in code
* controllers folder
* datums folder
* game folder
* cmon, work
* modules - admin to awaymissions
* cargo to events
* fields to lighting
* mapping > ruins
* rest of the code folder
* rest of the folders in the root directory
* DME
* fixes compiling errors. it compiles so it works
* readds map changes
* fixes dogborg module select
* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00
e582e7019e
Merge pull request #38023 from AutomaticFrenzy/patch/toh-kay
...
Fix various bugs with telekinesis
2018-05-25 10:49:21 -05:00
e57cf81636
Merge branch 'master' into upstream-merge-37582
2018-05-21 08:35:21 -05:00
5e48fcd275
Merge pull request #37846 from DaxDupont/axe-time
...
Small cult nerf do not be alarmed robustin think about your heart
2018-05-16 04:46:59 -05:00
f9f42658e1
Merge pull request #6714 from Citadel-Station-13/upstream-merge-37760
...
[MIRROR] Fixed stacks sometimes having the wrong amount if created on another stack
2018-05-14 12:28:41 -05:00
e089a8254f
Merge pull request #6725 from Citadel-Station-13/upstream-merge-37731
...
[MIRROR] Makes gauze deconstructable into cloth
2018-05-13 12:19:50 -05:00
Poojawa