shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,894 Commits 5 Branches 0 Tags
822cddc718e534720ecccfc8b9b206decfe9c4e0
Commit Graph

129 Commits

Author SHA1 Message Date
CitadelStationBot
2342c8f2bc Fixes scythes cutting kudzu (#2185) 2017-07-29 19:50:24 -07:00
CitadelStationBot
147bd4cf97 Lava is no longer a plating subtype (#2138) 2017-07-26 00:05:53 -07:00
LetterJay
6a961f7348 Merge pull request #2093 from Citadel-Station-13/upstream-merge-29401 
[MIRROR] Ore satchels no longer have infinite capacity
 2017-07-23 06:52:26 -05:00
CitadelStationBot
41101906c4 Adds logging for the blood contract 2017-07-21 18:28:11 -05:00
CitadelStationBot
c8763c994c Ore satchels no longer have infinite capacity 2017-07-21 18:20:53 -05:00
CitadelStationBot
94f7ec2380 The blood-drunk miner will fire its KA a bit more often 2017-07-20 22:25:48 -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
bf98e0d417 Picking up ores by crossing them no longer spams your chat box 2017-07-18 19:25:10 -05:00
CitadelStationBot
e522f715a2 [Ready] Shuttle dock() rewrite (#2040) 2017-07-17 22:52:18 -07:00
CitadelStationBot
609ae007ae Changes all access const to be a define 2017-07-16 11:44:47 -05:00
CitadelStationBot
63ffbdf090 Fixes cleave conditions for the cleaving saw (#2006) 2017-07-14 19:30:06 -07:00
CitadelStationBot
92c6b7b445 Adds a 'nemesis faction' system to transforming weapons 2017-07-13 17:46:51 -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
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
90c2a4f867 Removes now-unnecessary obj_integrity definitions 2017-07-09 19:44:48 -05:00
CitadelStationBot
9d85345b6d Fixes entire stacks of goliath plates being used on mechs 2017-07-09 06:44:46 -05:00
LetterJay
8bfda97c09 Merge pull request #1918 from Citadel-Station-13/upstream-merge-28998 
[MIRROR] Actually fixes wormhole jaunters, and no it was not my fault.
 2017-07-06 22:47:51 -05:00
LetterJay
b87632669e Merge pull request #1917 from Citadel-Station-13/upstream-merge-29061 
[MIRROR] Warp cubes are slightly less instant but way cooler
 2017-07-06 22:47:38 -05:00
CitadelStationBot
ee830e7dc8 Actually fixes wormhole jaunters, and no it was not my fault. 2017-07-06 20:15:44 -05:00
CitadelStationBot
a101497539 Warp cubes are slightly less instant but way cooler 2017-07-06 20:12:38 -05:00
CitadelStationBot
b6b999b15a Lowercased computer names 2017-07-06 20:09:27 -05:00
Poojawa
b1b4826c0c July 5th TG sync (#1883) 
July 5th TG sync
 2017-07-05 22:14:19 -05: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
b5025653b6 Luxury shelter capsules' display cases no longer spawn offhand objects (Fixes #28589) (#1694) 2017-06-30 20:57:00 -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
CitadelStationBot
237691f6fd [MIRROR] Fixes problems that were in the original PR (#1419) 
* Fixes problems that were in the original PR

* rej cleanup

* Wow CSS is even worse than byond
 2017-06-28 03:02:50 -05:00
CitadelStationBot
32f904356d [MIRROR] Removes check_tick from ORM ui_data (#1415) 
* Removes check_tick from ORM ui_data

* Update machine_redemption.dm

* Delete machine_redemption.dm.rej
 2017-06-28 02:28:00 -05:00
CitadelStationBot
65736b7e23 [MIRROR] Ports the Ore Redemption Machine to TGUI (#1414) 
* Ports the Ore Redemption Machine to TGUI

* Update tgui.css

* Update tgui.js

* Delete tgui.css.rej

* Delete tgui.js.rej
 2017-06-28 02:24:55 -05:00
LetterJay
9803f24547 Merge pull request #1785 from Citadel-Station-13/upstream-merge-28760 
[MIRROR] Adds some neat tiles and walls for use on lavaland
 2017-06-26 10:10:00 -05:00
CitadelStationBot
ac33b9defb Adds some neat tiles and walls for use on lavaland 2017-06-26 09:19:17 -05:00
CitadelStationBot
5cf2065432 Ninja Dash 2017-06-26 08:57:46 -05:00
LetterJay
43d4a06266 Merge pull request #1662 from Citadel-Station-13/upstream-merge-28543 
[MIRROR] Fixes crusher trophies not properly being added
 2017-06-26 06:13:46 -05:00
CitadelStationBot
384234a7d9 Fixes the kinetic crusher not emitting light 2017-06-23 13:49:37 -05:00
LetterJay
a4c9dc43dd Dufflebag => Dufflebag 2017-06-19 16:42:05 -05:00
CitadelStationBot
2990610c99 Fixes crusher trophies not properly being added 2017-06-18 18:42:05 -05:00
CitadelStationBot
88e6bf82d5 adds proper gibtonite detonation timing (#1462) 2017-06-17 13:32:35 -07:00
CitadelStationBot
db01827ede Examining an ore box you are adjacent to shows its contents. 2017-06-15 20:26:14 -05:00
LetterJay
4c1b223248 Merge pull request #1534 from Citadel-Station-13/SelectiveMirrorSync 
Selective mirror sync
 2017-06-14 06:41:01 -05:00
CitadelStationBot
e04f0310af ore coin crossed runtime fix 2017-06-13 21:02:34 -05:00
CitadelStationBot
33eb60747f Refactored advanced camera consoles (#1576) 2017-06-13 13:39:47 -07:00
LetterJay
55d30f865b upstream-merge-28062 2017-06-12 12:20:07 -05:00
CitadelStationBot
57dc205514 Adds the ability to attach papers and photos to airlocks 2017-06-11 17:29:48 -05:00
LetterJay
28d4372aa0 upstream-merge-27852 2017-06-11 00:20:55 -05:00
LetterJay
923c5b9035 Merge pull request #1308 from Citadel-Station-13/upstream-merge-27881 
[MIRROR] Luxury Bluespace Shelter Capsules, Take 2.
 2017-06-08 03:35:23 -05:00
LetterJay
ad97147dfe Merge pull request #1314 from Citadel-Station-13/upstream-merge-27870 
[MIRROR] Fixes ghosts using marker beacon
 2017-06-08 03:31:22 -05:00
LetterJay
35b56f3075 Merge branch 'master' into upstream-merge-27773 2017-06-06 09:05:26 -05:00
LetterJay
54549d43a2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27728 2017-06-05 23:07:52 -05:00
CitadelStationBot
b5d2cf3c99 [READY] Stacks will change item_states and w_class based on how full they are. (#1370) 2017-06-04 09:08:33 -07:00
CitadelStationBot
c77607e411 This doesn't do anything (#1390) 2017-06-04 09:05:28 -07:00