shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,049 Commits 5 Branches 0 Tags
3524bc24eaeda23f2ba59ea2aaba6885e305ee21
Commit Graph

85 Commits

Author SHA1 Message Date
Putnam3145
634154e7cf Merge pull request #10157 from Ghommie/Ghommie-cit452 
Ports "Fixes powernet avail checks"
 2019-12-17 11:33:33 -08:00
Ghommie
bc2e6a7f9b Ports "Fixes powernet avail checks" 2019-12-12 17:35:35 +01:00
Ghommie
3b8aebbbc2 refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open. 2019-11-29 00:40:16 +01:00
Ghommie
dd101ef221 Part 2 2019-11-19 18:00:56 +01:00
Poojawa
a8e16ce27e APC UI autoupdates properly 2019-10-03 14:00:17 -05:00
Ghommie
0513f3464a one 2019-06-05 19:20:25 +02:00
Poojawa
21d31c5763 Gives APCs inherent damage resistance/deflection 2018-10-05 15:30:51 -05:00
Poojawa
e847f5bb33 Increases APC health and damage resistance values 2018-10-05 15:26:10 -05:00
Poojawa
c6b53bb31b update on lock status 2018-09-22 04:06:28 -05:00
Poojawa
bc0d14c193 Continual updates until merged 2018-09-17 04:55:03 -05:00
Poojawa
284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
Jordan Brown
5e15a988f6 Refactor machinery to default to being anchored 2018-06-01 11:28:19 -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
81Denton
0333a50552 [Ready] Syndie air alarm/APC subtypes, cleaning up syndie lavaland piping 2018-05-16 12:18:36 -05:00
Jordan Brown
81deaaca6d Merge pull request #37648 from vuonojenmustaturska/apcunsmash 
Moves removing the cell to screwdriver_act for APCs
 2018-05-06 16:37:04 -05:00
vuonojenmustaturska
49150c542f Splits APC attackbys into tool acts, removes some old parts that do nothing and allows crowbars to remove the cell too (#37035) 
* APC crap

* moar define

* honk

* cover defines
 2018-05-02 01:32:34 -05:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
81Denton
b368ab377b fixes obj descs and adds new ones (#37483) 2018-04-27 13:21:08 -05:00
Poojawa
5518efebea everything but mob stuff 2018-04-23 01:06:17 -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
CitadelStationBot
0016b323f6 [MIRROR] Lowers damage cap on breaking hacked apcs (#6026) 
* lowers damage cap on breaking apcs (#36520)

* Lowers damage cap on breaking hacked apcs
 2018-03-19 21:44:19 -05: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
bc2f2a9728 [READY]Randomized Station Time + Night Shifts 2018-02-21 12:02:28 -06:00
Jordan Brown
f9353da855 Quote the armor lists 2018-02-16 00:26:26 -06:00
deathride58
72ff7be9bd code folder. 221 files changed wew 2018-02-12 21:03:40 -05:00
ShizCalev
f4685cfe01 [s] Fixes altclick exploits 2018-02-11 05:08:00 -06:00
Poojawa
03086dfa91 Tg 1 28 sync testing/confirmation (#5178) 
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
 2018-01-29 04:42:29 -06:00
Leo
2b4735ded0 Merge pull request #34384 from F-OS/patch-3 
Quality of life: Newly constructed APCS are unlocked
 2018-01-14 21:32:38 -06:00
Tad Hardesty
0418ee4df6 Replace explicit z-level checks with defines 2017-12-29 13:41:10 -06:00
LetterJay
408182758f Merge branch 'master' into upstream-merge-33498 2017-12-19 17:50:11 -06:00
Emmett Gaines
f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -06:00
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1 TG Sync 12/15/17 
s

s
 2017-12-15 06:27:57 -08:00
vuonojenmustaturska
fcceb5ec77 Finishes the forceMove port 2017-12-14 15:40:08 -06:00
Ashe Higgs
5621507b4a Adds emergency lights, built into light fixtures 2017-12-03 12:54:48 -06:00
Leo
541b8db684 Merge pull request #32985 from YPOQ/airlockfix 
Fixes AIs being unable to interact with unscrewed airlocks
 2017-11-24 14:11:39 -06:00
Jordan Brown
2498e1ddc0 Cleans up unused code 2017-11-20 10:14:32 -06:00
AutomaticFrenzy
b9c9b87441 Alt clicking additions (#32607) 
Adds alt clicking to lock/unlock for apc and air alarm
 2017-11-14 13:49:32 -06:00
Firecage
25b5bb3e44 Code Consistency: luminosity --> light_range 2017-10-22 00:06:35 -05:00
CitadelStationBot
adc2e46114 [MIRROR] Does some code standardization/consistency. (#3161) 
* Does some code standardization/consistency.

* fixes merge conflict generation

* Missed a few, oops

* Update pierrot_throat.dm
 2017-10-21 06:10:22 -05:00
Ashe Higgs
4fd360c694 Fixes cogged APCs being permanently locked to non-servants (#31673) 
* Fixes cogged APCs being inaccessible

* Doop ba doop
 2017-10-16 16:49:01 -05:00
Jordan Brown
075cb673c0 Remove drop_item, drop_item_v, put_in_hands_or_del 2017-10-07 12:37:06 -05:00
Ashe Higgs
e575bd6685 (Ready) Clockwork Cult Rework: Proof-of-concept 2017-09-26 15:22:09 -05:00
CitadelStationBot
a286d0c313 [MIRROR] Gives engineering cyborgs an item they can use in place of circuits for basic construction (#2875) 
* Gives engineering cyborgs an item they can use in place of circuits for basic construction

* fixes
 2017-09-22 23:35:54 -05:00
Poojawa
8406baebbe Makes APC cell_type actually pick a cell (#2747) 
* Ports TG#30327

* Update apc.dm

* maybe delta can be fully copies over, yes?
 2017-09-13 19:57:21 -05:00
CitadelStationBot
083fc1a7b4 [MIRROR] Standardized power displays (#2539) 
* Standardized power displays

* Update tgui.js

* Delete tgui.js.rej
 2017-09-13 17:57:16 -05:00
LetterJay
cd0997aa1e Merge branch 'master' into upstream-merge-30297 2017-09-12 23:36:35 -05:00
LetterJay
6951e39d13 Update apc.dm 2017-09-11 13:10:54 -05:00
KorPhaeron
d05fdb0eb0 Makes the station Z level into a list instead of a single define 2017-09-11 12:40:35 -05:00
CitadelStationBot
4a456fd2c7 Fixes APC pixel shift being off 2017-08-28 02:20:25 -05:00