shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,033 Commits 5 Branches 0 Tags
f8371a4fbe8aefddff6d7a362fb99ae5b06aeabc
Commit Graph

233 Commits

Author SHA1 Message Date
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
CitadelStationBot
bbc28aa856 Energy swords and other transforming energy weapons are now subtypes of transforming weapons (#2049) 2017-07-17 22:51:51 -07:00
CitadelStationBot
6f7e908c89 RPDs can now place disposals pipes on dense non-wall turfs (#2035) 2017-07-17 00:54:17 -07:00
CitadelStationBot
609ae007ae Changes all access const to be a define 2017-07-16 11:44:47 -05:00
CitadelStationBot
d21766956e [MIRROR] Cleaned up some emag_acts (#2018) 
* Cleaned up some emag_acts

* Delete port_gen.dm.rej

* Update port_gen.dm
 2017-07-15 13:17:56 -07:00
CitadelStationBot
54da14ea6b Rename Bumped to CollidedWith (#2017) 2017-07-15 11:44:12 -07:00
kevinz000
44742cb115 im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" (#2025) 
* Revert "Automatic changelog generation for PR #2021 [ci skip]"

This reverts commit 9d0cd37dd3.

* Revert "Disease Refactor (#2021)"

This reverts commit f2ac487927.
 2017-07-15 11:41:36 -07:00
CitadelStationBot
f2ac487927 Disease Refactor (#2021) 2017-07-15 11:40:49 -07:00
CitadelStationBot
a0a77f5a41 Refactors screwdriver coloring to use greyscale (#2003) 2017-07-14 19:34:03 -07:00
CitadelStationBot
5e079fa54f Welding tools now use overlays for fuel gauges, rather than icons (#1994) 2017-07-14 03:13:55 -07:00
LetterJay
798050317f Merge pull request #1991 from Citadel-Station-13/upstream-merge-28826 
[MIRROR] Adds a 'nemesis faction' system to transforming weapons
 2017-07-13 23:59:06 -05:00
CitadelStationBot
92c6b7b445 Adds a 'nemesis faction' system to transforming weapons 2017-07-13 17:46:51 -05:00
CitadelStationBot
55462ed7d1 Replaces ex_act and emp_act numbers with defines 2017-07-13 17:46:41 -05:00
CitadelStationBot
ff6bbbedf5 Changes some 1s and 0s to TRUE and FALSE (#1967) 2017-07-10 16:13:16 -07:00
CitadelStationBot
1b70c06474 Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs (#1970) 2017-07-10 16:10:42 -07:00
LetterJay
b4eee0a1c4 Merge pull request #1962 from Citadel-Station-13/upstream-merge-29145 
[MIRROR] Updates vending refill packs to reflect additional items added in headphones PR
 2017-07-09 23:06:28 -05:00
LetterJay
ff0c889a29 Merge pull request #1961 from Citadel-Station-13/upstream-merge-29140 
[MIRROR] Removes now-unnecessary obj_integrity definitions
 2017-07-09 23:06:13 -05:00
CitadelStationBot
d64469ccda Updates vending refill packs to reflect additional items added in headphones PR 2017-07-09 19:45:53 -05:00
CitadelStationBot
90c2a4f867 Removes now-unnecessary obj_integrity definitions 2017-07-09 19:44:48 -05:00
CitadelStationBot
5a11f53535 Fixes flashbangs stunning for a maximum of 0.3 seconds instead of 6 seconds 2017-07-09 06:44:49 -05:00
CitadelStationBot
55733ba0f4 Swords make sheathing/unsheating noises 2017-07-06 20:10:32 -05:00
CitadelStationBot
6c0926f062 Fixes forced two-handed weapons being unstorable 2017-07-06 08:26:00 -05:00
Poojawa
b1b4826c0c July 5th TG sync (#1883) 
July 5th TG sync
 2017-07-05 22:14:19 -05:00
katnep
b21556329b TAUR SWEATERS and keyhole (#1827) 
by request of annoying whiners, here are sweaters in the clothes mate
have fun
 2017-06-30 21:25:17 -07:00
CitadelStationBot
8627946f72 Repathes mining_hammer -> kinetic_crusher. Also fixes offhands being qdel'd more than once (#1753) 2017-06-30 21:22:45 -07:00
CitadelStationBot
5181326d54 [MIRROR] Adds some custom force strings and fixes a bug (#1700) 
* Adds some custom force strings and fixes a bug

* Delete clown_items.dm.rej
 2017-06-30 21:17:26 -07:00
CitadelStationBot
01456fddf1 Fixed small spelling + punctuation errors (#1716) 2017-06-30 20:46:40 -07:00
katnep
45ce2c4caa STIMPACKS POWERCREEP EDITION (#1828) 
* STIMPACKS POWERCREEP EDITION

added stimpacks and stimpack kits to the vendor
as well as my patented powercreep kit of survival pens

* FIXING IT

Having my own file is overrated

* more fixes

Still fixing it

* FINAL FORM

Fixed it.jpeg

* FINAL FIX

THIS IS FIXING BEYOND FIXING

* GO BEYOND

* IM GONNA PUNCH IT
 2017-06-30 20:12:10 -07:00
LetterJay
196db74cbe Merge pull request #1714 from Citadel-Station-13/upstream-merge-28588 
[MIRROR] Changes to the Atmos Watertank Backpack
 2017-06-27 22:59:32 -05:00
LetterJay
e680da7de6 Merge pull request #1770 from Citadel-Station-13/upstream-merge-28584 
[MIRROR] Ancient Space Station [Space Spawn Ruin]
 2017-06-27 21:25:50 -05:00
CitadelStationBot
6a38955803 Adds container types INJECTABLE and DRAWABLE 2017-06-27 08:19:49 -05:00
LetterJay
914434891a Merge pull request #1744 from Citadel-Station-13/upstream-merge-28685 
[MIRROR] Fixes the sprite for the nullrod clown dagger skin
 2017-06-26 10:52:21 -05:00
LetterJay
090b8b5055 Merge pull request #1768 from Citadel-Station-13/upstream-merge-28740 
[MIRROR] Station Engineers Spawn With Industrial Welder
 2017-06-26 10:51:51 -05:00