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

1630 Commits

Author SHA1 Message Date
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
b2c8115ca5 Winter coats now properly hold flashlights (#2043) 2017-07-17 22:51:14 -07:00
LetterJay
61640eaf72 Merge pull request #2048 from Citadel-Station-13/upstream-merge-29284 
[MIRROR] [s] Fixes goonchat cookie false positives
 2017-07-17 07:41:29 -05:00
CitadelStationBot
9c76e88952 [s] Fixes goonchat cookie false positives 2017-07-17 07:18:00 -05:00
CitadelStationBot
956f10f2d2 [s]Fixes panic bunker 2017-07-17 07:13:45 -05:00
CitadelStationBot
260a140f97 Ports instruments from /VG/station, including harmonicas, xylophones, saxophones, trombones, and a BIKE HORN. Repaths instruments to sound/instruments. Also, allows piano synth to play all instruments but eguitar and gives cargo a crate with everything. Clown gets the bike horn trumpet at roundstart. (#2034) 2017-07-17 00:52:43 -07: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
c3857fe264 Merge pull request #2031 from Citadel-Station-13/upstream-merge-29269 
[MIRROR] Fixes missiles being able to ricochet
 2017-07-15 23:19:41 -05:00
LetterJay
44473643bb Merge pull request #2029 from Citadel-Station-13/upstream-merge-29267 
[MIRROR] Makes round end delay message optional
 2017-07-15 23:19:08 -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
a4d968ec82 Fixes missiles being able to ricochet 2017-07-15 22:31:05 -05:00
CitadelStationBot
2cbfec38a2 Makes round end delay message optional 2017-07-15 22:19:46 -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
CitadelStationBot
b025182955 Possibly fix player_list sometimes having a null (#2022) 2017-07-15 11:45:33 -07:00
CitadelStationBot
b2f20fffd8 Fixes timestop! (and tweaks its sounds) (#2019) 2017-07-15 11:45:11 -07:00
LetterJay
dcf957f0b2 adds icons for PDAs by Cecily and the hunter hat (#2015) 
* adds icons for PDAs by Cecily and the hunter hat

* Update cit_hats.dm
 2017-07-15 11:44:26 -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
2ae38397c9 removes current method of handling flightsuit pulling (#2023) 2017-07-15 11:40:34 -07:00
LetterJay
3ed842376e Update species.dm 2017-07-15 10:06:30 -05:00
CitadelStationBot
2d3905457e [MIRROR] Rename Bump to Collide (#2002) 
* Rename Bump to Collide

* Delete bubblegum.dm.rej

* Update bubblegum.dm
 2017-07-14 21:35:56 -07:00
CitadelStationBot
bd3c3e9de4 Removes the entry in sound.dm for servostep.ogg (#2004) 2017-07-14 19:35:48 -07:00
CitadelStationBot
a0a77f5a41 Refactors screwdriver coloring to use greyscale (#2003) 2017-07-14 19:34:03 -07:00
Raeschen
6e72c48115 Added " say_mod = "chirps" " to the avian species entry to allow the say prefix to be "chirps" instead of "says" (#2008) 2017-07-14 19:30:17 -07:00
CitadelStationBot
63ffbdf090 Fixes cleave conditions for the cleaving saw (#2006) 2017-07-14 19:30:06 -07:00
CitadelStationBot
106cdfc37b [MIRROR] Fixes the maid costume's apron (#2010) 
* Fixes the maid costume's apron

* Delete admins.txt.rej
 2017-07-14 19:29:55 -07:00
ktccd
6d3123f63c Readds borers (#1999) 
Readds the cortical borers and also syndi-borers.
Syndi-borers now gives a response if you try to use it multiple times
too quickly, and also prevents usage more than once while it's still
waiting for ghost responses.
 2017-07-14 19:28:52 -07:00
LetterJay
df26bdd9cf cleanup 2017-07-14 10:22:43 -05:00
CitadelStationBot
3ee26917bd Organ Update [Cloning isn't broken edition] 2017-07-14 09:00:36 -05: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
LetterJay
9d3c4d4702 Merge pull request #1989 from Citadel-Station-13/upstream-merge-29215 
[MIRROR] Replaces ex_act and emp_act numbers with defines
 2017-07-13 23:57:35 -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
1da785ffb5 Removes old height parameter from CanPass proc 2017-07-13 17:46:36 -05:00
CitadelStationBot
da324257fe [MIRROR] Supermatter code cleanup (#1964) 
* Supermatter code cleanup

* Delete supermatter.dm.rej

* Update supermatter.dm
 2017-07-13 06:38:17 -07:00
CitadelStationBot
2892a3710d [MIRROR] Adds collapsing stone tiles (#1933) 
* Adds collapsing stone tiles

* Update necropolis_gate.dm

* Update necropolis_gate.dm.rej

* Delete necropolis_gate.dm.rej
 2017-07-13 06:38:07 -07:00
CitadelStationBot
f893863397 [MIRROR] Refactors speech/communication logging and adds coordinates to speech logs (#1905) 
* Refactors speech/communication logging and adds coordinates to speech logs

* Update clockwork_slab.dm

* Delete clockwork_slab.dm.rej

* Update browserOutput.dm

* Delete browserOutput.dm.rej
 2017-07-13 06:37:51 -07:00
CitadelStationBot
85fa3c0bee [MIRROR] Refactors flightsuit code to hopefully be less dumb (#1975) 
* Refactors flightsuit code to hopefully be less dumb

* Update flightsuit.dm

* Delete flightsuit.dm.rej

* Delete objs.dm.rej

* Delete mob_movement.dm.rej

* Delete carbon_movement.dm.rej

* Update mob_movement.dm

* Update flightsuit.dm

* Update mob_movement.dm

* fix
 2017-07-12 05:24:50 -07:00
CitadelStationBot
fcf09e06e0 Allows admins to set messages when they delay the round end (#1965) 2017-07-10 16:13:51 -07: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
CitadelStationBot
b3c3cf7537 Switches SM squawk to report integrity (#1956) 2017-07-10 06:45:06 -07:00
LetterJay
e10760e1a5 Merge pull request #1963 from Citadel-Station-13/upstream-merge-29143 
[MIRROR] Fixes race condition with admin proc calls and load admins
 2017-07-09 23:06:47 -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
LetterJay
08e044a522 Merge pull request #1960 from Citadel-Station-13/upstream-merge-29141 
[MIRROR] Necropolis curse mobs no longer fall into chasms
 2017-07-09 23:05:53 -05:00
LetterJay
19f805acc3 Merge pull request #1959 from Citadel-Station-13/upstream-merge-29134 
[MIRROR] Allows drones to switch to/from harm intent
 2017-07-09 23:05:42 -05:00