shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,276 Commits 5 Branches 0 Tags
c947dfdca5b1fd0cef47cd3facbbdcd71ebcbf41
Commit Graph

61 Commits

Author SHA1 Message Date
lolman360
1b35e02554 eee 2020-08-10 11:21:24 +10:00
lolman360
308d77da7c Merge branch 'master' into plumb 2020-08-09 22:48:18 +10:00
Letter N
22d5aebaa5 second batch - MAJOR: mech_fab, turrets 2020-07-24 14:38:04 +08:00
lolman360
661b9920fc luh mayo 2020-07-22 10:59:21 +10:00
lolman360
0f1aa3c0ca 'lolman? did you test your code?' 
no i did not ms. kevinz
 2020-07-22 10:49:56 +10:00
Artur
80b47ec1c0 Ports https://github.com/tgstation/tgstation/pull/50497 2020-04-23 09:55:28 +03:00
Ghommie
8fbfd07692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-22 00:55:32 +01:00
kevinz000
01390fa0e0 Merge remote-tracking branch 'citadel/master' into attack_chain 2020-02-10 04:18:02 -07:00
Ghommie
a726f09201 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-04 03:54:52 +01:00
Ghommie
95db5084ab Screw commit history. 2020-02-02 01:26:04 +01:00
Putnam3145
33122d0d92 Merge branch 'master' into TGUIs_Nexties 2020-02-01 00:49:10 -08:00
r4d6
58b969b8c6 Update RPD.dm 2020-01-29 20:34:57 -05:00
kevinz000
e50eb495df pre attack refactor 2020-01-27 16:30:23 -07:00
Artur
e360ac1d36 Conflict fix 2020-01-24 23:06:32 +01:00
kevinz000
4304a7dd42 Merge pull request #10602 from Ghommie/Ghommie-cit509 
RPD ventcrawler escapism sanity check.
 2020-01-23 04:47:46 -07:00
Artur
f5ad854c2c Conflict fix 2020-01-20 13:50:52 +02:00
r4d6
810556cbb7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Passive-Vents 2020-01-18 16:03:49 -05:00
Ghommie
a2e1c8ecf1 GLOB. 2020-01-18 18:45:20 +01:00
Ghommie
47b031dad2 Update. 2020-01-18 18:40:13 +01:00
Ghommie
82b65f13f4 RPD anti-ventcrawler escapist sanity check. 2020-01-18 18:23:54 +01:00
r4d6
6045d818d8 Add passive vents 2020-01-15 19:12:13 -05:00
Artur
8b8a112d2c Ohkay 2020-01-15 09:41:33 +02:00
Putnam
e468fa3e71 Added a binary version and fixed up sprites 2020-01-10 01:26:09 -08:00
Putnam
bdda3f940c it works 2020-01-09 18:55:56 -08:00
Putnam
fdbbcfe59a it's functional, sprite time 2020-01-08 17:05:43 -08:00
Michiyamenotehifunana
2845cb2e7d Resprites RCDs and RPDs 2019-07-23 20:23:45 +08:00
kevinz000
395b89d0a1 Update RPD.dm 2019-07-14 03:42:26 -07:00
Ghommie
d36bae06a7 Ports the Chem Master choose your pill PR plus post-improvements 2019-07-12 07:39:17 +02:00
Arturlang
39775a08ac Update RPD.dm 2019-06-07 19:56:31 +03:00
deathride58
36119e007d Properly fixes igniters by increasing the max hotspot expose temperature of sparks to 700 2019-03-15 16:49:10 -04:00
Poojawa
8b9ef1e400 Game folder 2018-09-11 04:06:45 -05:00
deathride58
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
Tad Hardesty
782c893cf4 Fix flipping of trinary pipe fittings and related RPD tooltips (#37982) 2018-05-23 06:33:07 -05:00
Tad Hardesty
111ad79eab Use spritesheets to reduce time spent sending PNG assets by 90+% 2018-05-09 22:44:57 -05:00
Dennok
105e55068b RPD pipe autowrenching (#36417) 
* RPD autowrenching

* up

add toggle, remove auto unwrenching
 2018-04-11 16:36:56 -05:00
Poojawa
5fa001c10f things with stuff (#6233) 
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
 2018-04-07 23:07:09 -04:00
Poojawa
6c7da493d9 Reee mirror bot. Hard syncs some missed PR stuff + maps (#5951) 
* maps and tgui

* missed defines and helpsers

* controller things

* datums

* game folder stuff

* module things

* icons

* stragglers

* map sync and updating

wew lad
 2018-03-14 16:49:40 -05:00
Jordan Brown
f9353da855 Quote the armor lists 2018-02-16 00:26:26 -06:00
CitadelStationBot
330a6ca0af Added transit tubes to the RPD (#5300) 2018-02-05 00:46:34 -06:00
oranges
9ff1be35cc Merge pull request #34429 from AutomaticFrenzy/patch/rpd-bad-placement 
Fix RPD embedding fixtures inside lattices and girders
 2018-01-16 14:26:53 -06:00
ShizCalev
8f1a21b2be Fixes missing pipe colors in RPD and pipe painter (#34371) 2018-01-15 03:01:36 -06:00
Leo
ba1f61cb9e Merge pull request #34357 from AutomaticFrenzy/patch/rpd-runtime 
Fix RPD runtimes and offsets of layered connector ports
 2018-01-13 08:58:44 -06: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
duncathan salt
52fc5e8bc6 RPD ui improvements 2017-11-17 18:03:56 -06:00
ACCount
1b9280776e Fixes pipe dispensers being unable to dispense bent pipes (#32743) 
* Fixes pipe dispensers not dispensing bent pipes

* Updates meter RPD icon file to the one that's actually used
 2017-11-15 19:12:34 -06:00
LetterJay
9ff35c5b2c Merge branch 'master' into upstream-merge-32435 2017-11-13 11:30:06 -06:00
LetterJay
c2d3ad9c3f Update RPD.dm 2017-11-12 08:15:18 -06:00
ACCount
500307b034 Disposal pipes and pipe dispensers refactor 2017-11-12 00:31:00 -06:00
LetterJay
6286f4d4c2 Merge branch 'master' into upstream-merge-32161 2017-11-11 23:02:13 -06:00
LetterJay
108e04e525 Merge pull request #3884 from Citadel-Station-13/upstream-merge-32567 
[MIRROR] [s] Fixes RPDs qdel'ing girders and causing runtimes
 2017-11-11 12:40:24 -06:00