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

89 Commits

Author SHA1 Message Date
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
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
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
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
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
CitadelStationBot
3ee26917bd Organ Update [Cloning isn't broken edition] 2017-07-14 09:00:36 -05:00
LetterJay
0c6343c3bc Merge pull request #1990 from Citadel-Station-13/upstream-merge-29197 
[MIRROR] Adds a "synthesizer" that's basically a handheld piano
 2017-07-13 23:58:37 -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
b3f8b2a2d7 Adds a "synthesizer" that's basically a handheld piano 2017-07-13 17:46:46 -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
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
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
90c2a4f867 Removes now-unnecessary obj_integrity definitions 2017-07-09 19:44:48 -05:00
CitadelStationBot
cdb3158af5 Fixes cartridges not linking with their host PDAs on creation 2017-07-06 09:06:29 -05:00
Poojawa
b1b4826c0c July 5th TG sync (#1883) 
July 5th TG sync
 2017-07-05 22:14:19 -05:00
CitadelStationBot
509b9562d3 Gives AI radios loudmode (#1875) 2017-07-04 19:52:35 -07:00
CitadelStationBot
45fd6a1447 Fixes PDA runtime href exploit (#1868) 2017-07-04 15:47:06 -07:00
Poojawa
789064a3a5 Clean up .rej files 2017-06-28 02:24:03 -05:00
LetterJay
bb916b6040 Merge branch 'master' into upstream-merge-28681 2017-06-27 06:16:34 -05:00
LetterJay
83fead2492 Merge pull request #1673 from Citadel-Station-13/upstream-merge-28567 
[MIRROR] Refactors PDA cartridge permissions
 2017-06-27 06:14:42 -05:00
LetterJay
f85de2ddd5 Update PDA_types.dm 2017-06-27 05:58:34 -05:00
LetterJay
2158ea1e67 Merge branch 'master' into upstream-merge-28681 2017-06-27 05:14:45 -05:00
LetterJay
8875fbefc5 Delete cart.dm.rej 2017-06-27 05:12:25 -05:00
LetterJay
9d6dec8975 Update cart.dm 2017-06-27 05:12:05 -05:00
LetterJay
163bcf0189 Delete PDA.dm.rej 2017-06-27 05:11:20 -05:00
LetterJay
926589fd58 Update PDA.dm 2017-06-27 05:11:06 -05:00
LetterJay
5571cca37c .rej cleanup 2017-06-26 06:14:42 -05:00
LetterJay
b4473bedb2 Merge pull request #1636 from Citadel-Station-13/upstream-merge-28382 
[MIRROR] Gives the captain a somewhat robust golden fountain pen, and some others an average fountain pen.
 2017-06-26 05:57:59 -05:00
CitadelStationBot
acc03ae85e Fixes bad del runtime 2017-06-24 11:48:05 -05:00
CitadelStationBot
68d8b76dec PDA Refactor Part 1: Phantom Blood Menace 2017-06-23 21:59:22 -05:00
CitadelStationBot
2530d8a09a Intercoms are now constructable 2017-06-23 13:40:25 -05:00
CitadelStationBot
4102d88802 Fixes shining lights into peoples eyes 2017-06-20 20:06:25 -05:00
LetterJay
42368581c5 Merge branch 'master' into upstream-merge-26965 2017-06-19 15:39:01 -05:00
CitadelStationBot
1dc24668a1 Refactors PDA cartridge permissions 2017-06-19 13:57:18 -05:00
LetterJay
a544d99f9f cleanup and commits 2017-06-19 12:35:05 -05:00
CitadelStationBot
3f92d14933 Gives the captain a somewhat robust golden fountain pen, and some others an average fountain pen. 2017-06-16 20:12:20 -05:00
CitadelStationBot
4ef7ad7724 Flashlight suduko (#1426) 2017-06-13 13:45:58 -07:00
CitadelStationBot
e69c61a4c5 Flashdarks can't be used for examining eyes/mouth. 2017-06-12 16:37:43 -05:00
CitadelStationBot
4bd99124de Adds F.R.A.M.E. cartridge 2017-06-10 12:18:31 -05:00
CitadelStationBot
d9e3699f88 Ports Goonchat 2017-06-08 16:27:56 -05:00
CitadelStationBot
8fcbf20c79 Another spawn timer (#1388) 2017-06-04 09:07:16 -07:00
LetterJay
f2730839d4 Merge pull request #1168 from Citadel-Station-13/upstream-merge-26361 
[MIRROR]  Refactors explosions
 2017-05-30 15:15:51 -05:00
CitadelStationBot
94fdea8866 Some pAI fixes 2017-05-29 14:42:48 -05:00
CitadelStationBot
4b9a7ce9cf Adds AI follow links to PDA messages and holopad speech 2017-05-28 08:14:21 -05:00
CitadelStationBot
11344c4682 Refactors explosions 2017-05-24 16:45:00 -05:00
CitadelStationBot
a430e24555 Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual 2017-05-18 16:38:09 -05:00
CitadelStationBot
1b39381ee7 Ports radios to Initialize (#983) 2017-05-18 12:19:55 -05:00