shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
43,568 Commits 5 Branches 0 Tags
08f251a88c898ce3a635909512303170483694de
Commit Graph

99 Commits

Author SHA1 Message Date
SandPoot
123de14009 upload files 2021-02-18 15:05:39 -03:00
SandPoot
f738023097 Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing" 
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
 2021-02-18 15:04:46 -03:00
SandPoot
cf2e70671a upload files 2021-02-18 14:47:10 -03:00
Putnam
9bb3ba5c5a added ethereals 2020-08-08 00:08:43 -07:00
silicons
184e3992f3 fixes 2020-07-21 11:56:23 -07:00
silicons
98d3ac80d9 :pika: 2020-07-20 11:25:17 -07:00
silicons
984796b8c6 sigh 2020-07-20 10:46:52 -07:00
Ghommie
f5ffd7d2a9 Easing fine tuning of the system. 2020-07-03 03:00:33 +02:00
kevinz000
05fe0c7dcc ok 2020-05-30 00:59:29 -07:00
Ghom
cea958f822 Fixing various issues. (#12368) 
* Fixing various issues.

* Lights.
 2020-05-28 00:36:57 -07:00
Ghom
12ac08d7c5 Porting tesla/electrocute code updates. (#12280) 
* Porting tesla/electrocute code updates.

* Why is the dominator being insta-deleted by zaps a good idea?

* Yikes.

* ah
 2020-05-17 16:35:17 -07:00
Ghom
bd19763236 Update lighting.dm 2020-05-12 00:18:27 +02:00
kevinz000
1981b6b3c7 Merge pull request #12130 from Ghommie/Ghommie-cit727 
Dims the lights, again.
 2020-05-08 23:30:19 -07:00
Ghommie
a09c7180cb Dims the lights again. 2020-05-06 23:55:36 +02:00
Ghommie
643ef48f0e Macros, generic skill implementations. 2020-05-05 04:42:34 +02:00
Ghommie
42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
Ghom
750acd7023 Update lighting.dm 2020-04-16 05:42:08 +02:00
Ghom
ab2d458947 Update lighting.dm 2020-04-12 07:12:54 +02:00
actioninja
abde27c098 layer changes 2020-03-28 23:50:08 -07:00
Ghommie
59b1a223a3 Ok, done. 2020-03-08 22:51:36 +01: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
Seris02
18489e5b65 merge fixes 2020-02-02 11:51:26 +08:00
Ghommie
95db5084ab Screw commit history. 2020-02-02 01:26:04 +01:00
Ghom
fa5a69523b Merge pull request #10414 from CameronWoof/lights-booooooooooooooi 
The Great Citadel De-Pissening of 2020
 2020-01-28 18:12:30 +01:00
Seris02
e45cc4933c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hijackbackup 2020-01-27 08:33:38 +08:00
Seris02
934c8fe533 updates + thingamajig 2020-01-23 15:25:45 +08:00
Ghommie
5644617786 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit450 2020-01-20 20:59:38 +01:00
Seris02
a100f9382e better, there, happy now github 2020-01-20 14:51:53 +08:00
Seris02
5524b0fa03 yes. 2020-01-20 13:00:24 +08:00
Seris02
04b34ec8ed hijack implant 2020-01-18 18:04:31 +08:00
Ghommie
c14439494a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-12 19:18:03 +01:00
CameronWoof
0c70fc9234 The Great Citadel De-Pissening of 2020 2020-01-02 21:24:03 -08:00
Ghommie
57cecd2499 work 2019-12-25 06:54:44 +01:00
Ghommie
e74339ce8b Jfc that's a lot of work! 2019-12-23 04:24:13 +01:00
Ghommie
19a3aca619 I fear for my powernet 2019-12-10 15:33:15 +01:00
Ghommie
542c9007ee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-12-06 20:09:35 +01:00
Ghommie
dd101ef221 Part 2 2019-11-19 18:00:56 +01:00
Ghommie
6484eea339 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-11-15 00:36:50 +01:00
Ghommie
592d1a4b54 Unmodularize cargo console, disposal bin, lighting bulbs/tubes and alien nest ruin. 2019-11-03 01:55:59 +01:00
Ghommie
2c578ca683 Ports move force and move resist, movement/pushing/pulling tweaks & co. 2019-10-24 18:01:46 +02:00
Ghommie
b818b1eedd Updating spraycans and crayons code. 2019-07-17 15:45:48 +02:00
Ghommie
129ca9d71f Ports "Refactors NODROP flag into TRAIT_NODROP" 2019-07-13 10:27:39 +02:00
Ghommie
d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
Poojawa
42db44b39e Alien Ruin fix, various cherrypicked upstream fixes 
Also adds new buildmode
 2018-09-13 22:55:11 -05:00
Poojawa
284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
deathride58
b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
oranges
ffd705c8d7 Merge pull request #38366 from AutomaticFrenzy/patch/fire-overlay 
Replace area-wide fire overlay with reddening the lights
 2018-06-11 22:29:10 -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
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00