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

610 Commits

Author SHA1 Message Date
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
af581f8ab1 Merge pull request #2065 from Citadel-Station-13/upstream-merge-29280 
[MIRROR] Refactor Lung Handling
 2017-07-31 15:37:41 -05:00
ktccd
b8c8f9d3b2 Merge pull request #2202 from Citadel-Station-13/upstream-merge-29577 
[MIRROR] Cyborgs grabbing ore works consistently
 2017-07-31 22:02:44 +02:00
ktccd
445fb5a395 Merge pull request #2196 from Citadel-Station-13/upstream-merge-29412 
[MIRROR] Colossus's shotgun is now a static-spread blast of 6 bolts
 2017-07-31 21:59:10 +02:00
ktccd
f74baf59e7 Merge pull request #2186 from Citadel-Station-13/upstream-merge-29547 
[MIRROR] Player-controlled medibots are now alerted when they can't heal someone
 2017-07-31 21:48:50 +02:00
CitadelStationBot
d3f488a5ee Cyborgs grabbing ore works consistently 2017-07-31 07:10:17 -05:00
LetterJay
8a174f8a76 Update damage_procs.dm 2017-07-31 06:24:52 -05:00
Poojawa
f53d66b319 Rabbit parts (#2201) 2017-07-31 05:54:16 -05: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
LetterJay
f90ddf0596 Update lizard.dm 2017-07-30 23:35:11 -05:00
CitadelStationBot
b953db165d Colossus's shotgun is now a static-spread blast of 6 bolts 2017-07-30 19:58:21 -05:00
CitadelStationBot
5da5e58ee5 Fixes a lot of eye damage procs 2017-07-30 08:16:38 -05:00
LetterJay
70a5aed428 Merge pull request #2054 from Citadel-Station-13/upstream-merge-28977 
[MIRROR] Augment Styles/Changes
 2017-07-29 23:56:52 -05:00
CitadelStationBot
70df3e8557 Player-controlled medibots are now alerted when they can't heal someone 2017-07-29 19:44:44 -05:00
CitadelStationBot
3f8acbc2c4 Removes bows (#2163) 2017-07-28 02:53:47 -07:00
ktccd
c52f7a0475 Delayed objective (#2140) 
Delayed objective [Latejoiners can now be selected as traitor targets]
 2017-07-27 05:27:58 -07:00
CitadelStationBot
e085c33ac5 Makes narsie less huge (#2144) 2017-07-26 22:57:11 -07:00
CitadelStationBot
4e6e4faed8 Adds a mini fire extinguisher to janitor and service borgs 2017-07-26 15:45:10 -05:00
CitadelStationBot
147bd4cf97 Lava is no longer a plating subtype (#2138) 2017-07-26 00:05:53 -07:00
CitadelStationBot
d26fe6c877 Attacking yourself always hits the zone you're targeting (#2131) 2017-07-25 15:34:27 -07:00
ktccd
e1ed61ef35 Fixes empty subtle emotes (#2133) 
Makes the subtle emote not work if you try to use an empty emote string
OR if you cancel it early.
 2017-07-25 15:27:20 -07:00
CitadelStationBot
c3b3462322 The Hierophant will now release a burst when melee attacking instead of actually hitting its target (#2101) 2017-07-24 04:08:26 -07:00
CitadelStationBot
9ec9842f39 Medibots now have the proper icons (#2099) 2017-07-24 04:07:42 -07:00
CitadelStationBot
9c4923a6ca Fixes some human deletion runtimes. (#2104) 2017-07-24 04:07:13 -07:00
CitadelStationBot
4fbdf9851d Fixes a drone ping issue 2017-07-21 18:19:49 -05:00
LetterJay
8cf4f04a14 Merge pull request #2086 from Citadel-Station-13/upstream-merge-29378 
[MIRROR] The blood-drunk miner will fire its KA a bit more often
 2017-07-21 08:52:32 -05:00
CitadelStationBot
484ea6d20f Converted borgs will properly show the glowing eye message at distances of 1 2017-07-20 22:25: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
c38fe60fc4 Update damage_procs.dm 2017-07-19 13:36:43 -05:00
LetterJay
cd0845bcd8 Update damage_procs.dm 2017-07-19 13:34:20 -05:00
LetterJay
44ce24476a Merge pull request #2079 from Citadel-Station-13/upstream-merge-29344 
[MIRROR] Drakes dying during the brief part of the swoop where they can be damaged will properly reset transform and alpha
 2017-07-19 13:30:44 -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
62f633a1ad Drakes dying during the brief part of the swoop where they can be damaged will properly reset transform and alpha 2017-07-19 11:19:35 -05:00
LetterJay
95d2969339 Merge pull request #2068 from Citadel-Station-13/upstream-merge-29283 
[MIRROR] Cyborgs regenerate oxygen damage, and can heal toxin damage with cable coils
 2017-07-19 05:34:56 -05:00
LetterJay
7cbdc0e2ae Merge pull request #2070 from Citadel-Station-13/upstream-merge-29356 
[MIRROR] Fixes the baseturf bad arg runtime and fixes the jumpToNullSpace proc
 2017-07-19 05:34:24 -05:00
CitadelStationBot
0b7d08d5ac Fixes the baseturf bad arg runtime and fixes the jumpToNullSpace proc 2017-07-19 04:05:53 -05:00
CitadelStationBot
5801f6211f Cyborgs regenerate oxygen damage, and can heal toxin damage with cable coils 2017-07-18 18:45:30 -05:00
CitadelStationBot
1ebdf19cdb Refactor Lung Handling 2017-07-18 09:59:09 -05:00
CitadelStationBot
a72962c300 Made some object lists less terrible to read 2017-07-18 09:44:43 -05:00
CitadelStationBot
228f539eca Prevents the anomalous crystal from making fantasy into reality 2017-07-18 06:46:00 -05:00
CitadelStationBot
0ce34e08b6 Augment Styles/Changes 2017-07-18 06:45:44 -05:00
CitadelStationBot
e522f715a2 [Ready] Shuttle dock() rewrite (#2040) 2017-07-17 22:52:18 -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
609ae007ae Changes all access const to be a define 2017-07-16 11:44:47 -05:00
LetterJay
344dc1a061 Merge pull request #2032 from Citadel-Station-13/upstream-merge-29257 
[MIRROR] Fixes monkeys trying to take offhands
 2017-07-15 23:19:59 -05:00
LetterJay
8d31153fdc Merge pull request #2005 from Citadel-Station-13/upstream-merge-29223 
[MIRROR] Organ Update [Cloning isn't broken edition]
 2017-07-15 23:18:53 -05:00
CitadelStationBot
f634966a34 Fixes monkeys trying to take offhands 2017-07-15 22:33:14 -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
cebutris
099b908d64 Fixes traitor holoparasites (#1904) 
* fixes holoparasites

* adds #1051 and #1066

* as it turns out I'm blind

* fixes line 500 indentation
 2017-07-15 11:48:56 -07:00