shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,836 Commits 5 Branches 0 Tags
063a44281e39bdf01a27ea42942a0da43ecdfd0a
Commit Graph

265 Commits

Author SHA1 Message Date
Ashe Higgs
e575bd6685 (Ready) Clockwork Cult Rework: Proof-of-concept 2017-09-26 15:22:09 -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
LetterJay
188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
kevinz000
35b7b93b24 ok this is going to be a pain in the ass ain't it (#2458) 
lets hope nothing blows up this time (Flags PR but it works!)
 2017-08-22 05:01:38 -07:00
kevinz000
6a309b5996 Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" (#2457) 
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
 2017-08-22 04:04:21 -07:00
LetterJay
b01a24c95b my eyes hurt 2017-08-22 01:42:20 -05:00
LetterJay
a0cf777040 Merge branch 'master' into upstream-merge-29940 2017-08-21 23:29:24 -05:00
CitadelStationBot
b5e7f7f7fe [MIRROR] Adds defines for mouse_opacity (#2381) 
* Adds defines for mouse_opacity

* Delete misc.dm.rej

* Update misc.dm
 2017-08-21 20:29:37 -07:00
CitadelStationBot
4961966552 |SPECIES FOOD PREFERENCES| (#2232) 
* Species food preferences

* sync

* Update humans.dm

* FUCK PUBBY
 2017-08-21 20:23:30 -07:00
LetterJay
83f4733027 Rename _circuitboard.dm to circuitboard.dm 2017-08-21 20:01:59 -05:00
LetterJay
ae9e4495f9 Merge branch 'master' into upstream-merge-29747 2017-08-20 09:53:17 -05:00
CitadelStationBot
87b3df3069 Replace all secondary flags with bitflags stored in the flags_2 var 2017-08-17 09:19:14 -05:00
LetterJay
0ffaf66d1f Merge branch 'master' into upstream-merge-29690 2017-08-15 19:18:22 -05:00
LetterJay
e5cd79a14e Merge pull request #2373 from Citadel-Station-13/upstream-merge-29854 
[MIRROR] Moved can_trigger_gun to item/weapon parent
 2017-08-14 18:53:38 -05:00
LetterJay
300fc768a5 Merge pull request #2265 from Citadel-Station-13/upstream-merge-29727 
[MIRROR] The inhands of the Dark Blessing chaplain weapon is now visible.
 2017-08-14 18:37:28 -05:00
CitadelStationBot
97243fca3a Moved can_trigger_gun to item/weapon parent 2017-08-14 16:05:43 -05:00
CitadelStationBot
bd35823012 [ready]Makes bIcon better 2017-08-13 17:41:12 -05:00
CitadelStationBot
1e3ea07d8b Adds icon_states to the unused and used Eldritch whetstones 2017-08-13 01:28:24 -05:00
LetterJay
a9a7807473 Merge pull request #2339 from Citadel-Station-13/upstream-merge-29819 
[MIRROR] His Grace now shows up on the orbit list
 2017-08-12 06:36:57 -05:00
LetterJay
dd6c9d6a04 Merge pull request #2334 from Citadel-Station-13/upstream-merge-29811 
[MIRROR] Fixes cable cuff inhand
 2017-08-12 06:36:15 -05:00
LetterJay
122727059b Merge pull request #2333 from Citadel-Station-13/upstream-merge-29804 
[MIRROR] Ports weaponry to Initialize
 2017-08-12 06:35:25 -05:00
LetterJay
6b6e5d0018 Merge pull request #2326 from Citadel-Station-13/upstream-merge-29805 
[MIRROR] decapitalizes flyswatter in weaponry.dm
 2017-08-12 06:34:28 -05:00
CitadelStationBot
582a106d8e His Grace now shows up on the orbit list 2017-08-11 15:09:24 -05:00
CitadelStationBot
84076d7bb9 intialize() supermatter sword (#2332) 2017-08-11 12:29:51 -07:00
CitadelStationBot
6c6d8e5193 Fixes cable cuff inhand 2017-08-11 02:52:25 -05:00
CitadelStationBot
dab46b002c Ports weaponry to Initialize 2017-08-11 02:50:20 -05:00
CitadelStationBot
f6da0f89c3 decapitalizes flyswatter in weaponry.dm 2017-08-10 08:09:25 -05:00
CitadelStationBot
4d19a89519 Removes a great amount of machinery copypasta with circuitboards. 2017-08-09 19:24:19 -05:00
LetterJay
26ca12fb04 Merge pull request #2310 from Citadel-Station-13/upstream-merge-29773 
[MIRROR] Fix RCL loading
 2017-08-09 02:22:09 -05:00
CitadelStationBot
5eadc197cf Fix RCL loading 2017-08-08 14:59:10 -05:00
CitadelStationBot
cdbaf5c4e8 Standardized CENTCOM spelling 2017-08-08 09:05:44 -05:00
CitadelStationBot
b0361c2c64 The inhands of the Dark Blessing chaplain weapon is now visible. 2017-08-05 12:20:27 -05:00
CitadelStationBot
9449004c36 Gives an initialize hint to stacks, boxes, closets and bots (#2256) 2017-08-04 08:41:04 -07:00
CitadelStationBot
dd22c79678 Completes major inhand split project (#2178) 2017-08-02 06:30:33 -05:00
LetterJay
5734a2c7ed Merge pull request #2222 from Citadel-Station-13/upstream-merge-29610 
[MIRROR] Fixes devil pitchforks being uninitialized
 2017-08-02 06:06:33 -05:00
CitadelStationBot
8a4ddbe8a8 [MIRROR] Ports Rapid Cable Layers from /vg/ and paradise (#2162) 
* Ports Rapid Cable Layers from /vg/ and paradise

* rej clean up + manual sync

* maps and .rej file cleanup

* sprite and WGW memes

* actual spellchecked memes

* some other map fix memes

* fuck it, let's just hard sync maps

* dumb paperwork shit for maps

* Revert "dumb paperwork shit for maps"

This reverts commit 8e70bbec0f407c334cd81f5b92aafdb90544ca9d.

* *autistic screeching*

* REEEEEEEEEEEEEEEEEEEEE

* Fuck off I want to do something else
 2017-08-02 04:56:44 -05:00
CitadelStationBot
76f7fcef9a [MIRROR] Cleaned up paper varedits + tidied up paths (#2156) 
* Cleaned up paper varedits + tidied up paths

* work smarter, not harder

* citadel snowflake

* Update uplink_item_cit.dm
 2017-08-02 03:17:32 -05:00
CitadelStationBot
1e82ad9d3e Fixes devil pitchforks being uninitialized 2017-08-01 17:57:44 -05:00
CitadelStationBot
55f1de10a6 Spellchecking 2017-08-01 08:46:20 -05:00
kevinz000
bbcad2fa58 Proper mirror PR for the disease refactor because I fucked up the first one. (#2026) 
* Revert "im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" (#2025)"

This reverts commit 44742cb115.

* Delete shuttle_loan.dm.rej

* Delete life.dm.rej

* Update life.dm

* Delete life.dm.rej

* compile
 2017-07-31 23:41:22 -07:00
LetterJay
35fba1933e Merge pull request #2063 from Citadel-Station-13/upstream-merge-29304 
[MIRROR] Made some object lists less terrible to read
 2017-07-31 03:43:03 -05:00
CitadelStationBot
f9a6ee8d76 Give c4 correct plastic_overlay (#2183) 2017-07-29 19:51:38 -07:00
CitadelStationBot
5f8da9c34b Prevents the captain's sabre from rustling jimmies (#2113) 2017-07-24 04:08:41 -07:00
CitadelStationBot
c8763c994c Ore satchels no longer have infinite capacity 2017-07-21 18:20:53 -05:00
CitadelStationBot
64f7a14e07 Adds investigate logs to portals 2017-07-20 22:26:01 -05:00
LetterJay
cff128c5d5 Merge pull request #2073 from Citadel-Station-13/upstream-merge-29180 
[MIRROR] Small belt overlay rewrite, and tool overlays for toolbelts
 2017-07-19 13:37:25 -05:00
LetterJay
27b826a6f1 Merge pull request #2033 from Citadel-Station-13/upstream-merge-29260 
[MIRROR] Changes all access const to be a define
 2017-07-19 13:18:58 -05:00
CitadelStationBot
e6d6478482 Small belt overlay rewrite, and tool overlays for toolbelts 2017-07-19 09:30:06 -05:00
CitadelStationBot
a72962c300 Made some object lists less terrible to read 2017-07-18 09:44:43 -05:00
CitadelStationBot
c294d781b6 Fixes flashbang stun times (#2056) 2017-07-18 06:14:29 -07:00