Commit Graph

44 Commits

Author SHA1 Message Date
Ghom 6f66d76680 Merge pull request #10705 from kevinz000/revert_poojawa_blood_1
Cleanup/Partial revert of RGB blood ""rework""
2020-02-02 19:08:57 +01:00
Ghom 8a81ba9efe Ok here we go. 2020-02-02 18:40:06 +01:00
Seris02 81039b131b fixes 2020-01-31 09:49:08 +08:00
kevinz000 75e1108f33 optizmize 2020-01-24 21:45:43 -07:00
Ghom 5bc7229a9f Quick rubber toolbox materials fix. 2020-01-20 19:11:43 +01:00
AffectedArc07 16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Hatterhat 186194418e tg 43454+43688 port, tweaks w/ trilby, db crate 2020-01-04 01:33:32 -06:00
GrayRachnid 4ae76cf1d9 WHY
D
2019-11-20 23:11:46 -05:00
GrayRachnid 48d1bd1160 fixes goldbox 2019-11-20 18:47:35 -05:00
Ghommie 1e49ce76d3 Dreamchecker compatibility changes, part 1. 2019-11-10 20:48:30 +01:00
Ghommie a50606bb67 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit259 2019-10-24 10:10:07 +02:00
Ghommie e1928a18f1 Porting GetComponent macros removal, and some related changes. 2019-10-23 15:04:28 +02:00
Poojawa 0482973e8f Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-01 22:38:12 -05:00
Poojawa 9bd6f83034 Applies rad_flags to a lot of common items + bluespace bags
Also applies fireproofing to Captain's bag. Eng Sachel /duffle get it too for consistency.
2019-09-28 03:22:17 -05:00
Poojawa bd49187ea7 on second thought, let's not try to half ass fancy ideas. 2019-08-26 14:45:36 -05:00
Poojawa bdae9e051b Fixes some errant issues with overlays 2019-08-26 14:15:55 -05:00
Ghommie 5b97a7533d it only affects maploaded items anyway. 2019-07-09 04:34:13 +02:00
Ghommie bd9fa27ca1 Now it's tested. 2019-07-08 16:24:26 +02:00
Ghommie 9d35584e58 fixes uninteractable toolboxes. 2019-07-08 15:34:19 +02:00
Ghommie 9043402483 Rubber toolboxes. 2019-07-08 14:34:14 +02:00
Trilbyspaceclone 88c01dd521 I need to take a brake 2019-07-01 16:47:50 -04:00
Trilbyspaceclone ed07e25371 Corrects the "Durasteel" to be plastitanium tool boxes 2019-06-21 03:45:15 -04:00
kevinz000 2cda2380f6 durasteel toolboxes 2019-06-08 03:50:22 -07:00
Trilbyspaceclone 4c0caa3aae Update toolbox.dm 2019-05-10 14:51:49 -04:00
kevinz000 651741f6f9 Update toolbox.dm 2019-01-15 19:56:47 -08:00
kevinz000 b079a5e8df Update toolbox.dm 2018-12-18 18:06:04 -08:00
kevinz000 900da0624b Update toolbox.dm 2018-12-11 01:53:27 -08:00
kevinz000 44d0c05100 Update toolbox.dm 2018-12-07 13:40:37 -08:00
Poojawa 7d300117af literally everything Bhjin has been complaining about
also modularizes stuff and adds more comments. Like responsible downstream repos should have.
2018-09-18 03:59:46 -05:00
Poojawa 8b9ef1e400 Game folder 2018-09-11 04:06:45 -05:00
Nick fad5d5db83 Update toolbox.dm 2018-08-29 17:49:00 +02:00
Nick 03358c2db6 Update toolbox.dm 2018-08-29 17:48:16 +02:00
Nick 770cefe387 Update toolbox.dm 2018-08-25 21:33:21 +02:00
kevinz000 0ee8542677 Update toolbox.dm 2018-08-01 21:27:43 -07:00
deathride58 6a07a66cb3 Merge branch 'master' into upstream-merge-37476 2018-05-06 07:07:02 +00:00
kevinz000 3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
oranges 7d45e045a3 Uppercases slot defines. 2018-04-27 20:14:39 -05:00
Poojawa cc6b320f83 game folder 2018-04-23 00:17:28 -05:00
Ashe Higgs 8ec16df2e4 Adds the Family Heirloom, Nyctophobia, and Monochromacy traits, and rebalances Social Anxiety (#36426)
* Adds some more traits

* April Fools' heirlooms

* Fixes the detective sound

* Refactor to use signals
2018-03-28 12:15:06 -05:00
CitadelStationBot cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
2017-12-11 16:36:38 -08:00
LetterJay e1c103116e Update toolbox.dm 2017-09-27 17:35:52 -05:00
Ashe Higgs e575bd6685 (Ready) Clockwork Cult Rework: Proof-of-concept 2017-09-26 15:22:09 -05:00
CitadelStationBot 2a860d1954 [MIRROR] More Initialize() fixes, requires someone to test with DB (#2857)
* More Initialize() fixes, requires someone to test with DB

* fucking mirror failure
2017-09-22 23:35:22 -05:00
kevinz000 c638386507 Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)
* fuck pubby

* fuck you too ceres

* ree

* this is going to be a disaster isn't it

* disaster

* dme

* -_-

* tg

* woops

* proper sync

* Welcome to conflict hell.

* lets hope this fixes more things than it breaks

* gdi

* goddamnit
2017-08-24 21:07:58 -07:00