shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,028 Commits 5 Branches 0 Tags
360e7b60cfb00a0b8a6484fcc1e51ddb86e5a905
Commit Graph

120 Commits

Author SHA1 Message Date
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
CitadelStationBot c61bb0476f [MIRROR] Cleans up some Initializes (#943) 
* Cleans up some Initializes

* Update farm_animals.dm

* Delete farm_animals.dm.rej

* Update farm_animals.dm
 2017-05-18 11:13:53 -05:00
CitadelStationBot a317d23a51 [MIRROR] Manifest Spirit is better for summoning cannon fodder but slightly worse for instantly summoning Nar-Sie (#916) 
* Manifest Spirit is better for summoning cannon fodder but slightly worse for instantly summoning Nar-Sie

* fixes .rej
 2017-05-18 09:37:30 -05:00
CitadelStationBot eb359f1014 [MIRROR] Cerestation Tweaks VI: Shuttle Edition (#876) 
* Cerestation Tweaks VI: Shuttle Edition

* fix .rej
 2017-05-18 06:51:26 -05:00
CitadelStationBot 8bcaa54cbe [MIRROR] Fixes language code ignoring holder restrictions (#858) 
* Fixes language code ignoring holder restrictions

* resolve .rej file.
 2017-05-18 04:13:57 -05:00
CitadelStationBot 257cf986c5 Repaths C4 (#808) 
* Repaths C4

* Delete tgstation.2.1.3.dmm.rej

* Add files via upload

* update CitadelStation-1.2.1.dmm
 2017-05-18 00:37:20 -05:00
CitadelStationBot 242bff4288 Prepends object names with 'The' in speech 2017-05-17 05:13:47 -05:00
LetterJay 52fa1f314f Merge branch 'master' into upstream-merge-26760 2017-05-14 01:02:26 -04:00
CitadelStationBot 5790e8359a [MIRROR] GPS Personalizations [Post TGPSUI] (#642) 
* GPS Personalizations [Post TGPSUI]

* Delete gps.dm.rej

* Update gps.dm

* eol
 2017-05-10 16:27:49 -07:00
CitadelStationBot 93e652e07b Capitalizes machine names when they talk on radio (#886) 2017-05-10 16:04:58 -07:00
kevinz000 005d8a8156 Lets try that again... (#868) 
* TGUI GPS

* fixes .rej
 2017-05-08 22:58:46 -07:00
kevinz000 77c066d93a Revert "[MIRROR] TGUI GPS" (#867) 
* Revert "Automatic changelog generation for PR #608 [ci skip]"

This reverts commit 7701c39fde.

* Revert "TGUI GPS (#608)"

This reverts commit ba0f4b1c59.
 2017-05-08 22:48:34 -07:00
CitadelStationBot ba0f4b1c59 TGUI GPS (#608) 2017-05-08 22:46:42 -07:00
kevinz000 2e0dd27978 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-26813 2017-05-07 22:28:00 -07:00
CitadelStationBot 7c56c058b3 Adds examining mouths with flashlights 2017-05-04 06:11:22 -05:00
CitadelStationBot 33a93a611b Curator Update 2017-05-03 22:22:12 -05:00
CitadelStationBot 036109de58 Changes a bunch of hrefs to the proper defines 2017-05-02 02:20:07 -05:00
CitadelStationBot bcab389ca2 New() goes in the trash, we've gotta Initialize() 2017-04-26 17:15:48 -05:00
CitadelStationBot a905c15dad Replaces /image with /mutable_appearance (#556) 
* Replaces /image with /mutable_appearance, where appropriate

* Update miscellaneous.dm

* Delete miscellaneous.dm.rej

* Delete pet.dm.rej

* Update pet.dm

* Update species.dm

* Update miscellaneous.dm

* Update species.dm

* Update miscellaneous.dm

* Delete species.dm.rej

* Update species.dm

pretty sure I got all the indentation correct THIS time, ffs

* Update species.dm

* Update species.dm

fucking tabs man, fucking tabs.
 2017-04-26 08:18:35 -05:00
LetterJay 5d4afa23bc Merge pull request #561 from Citadel-Station-13/upstream-merge-25093 
[MIRROR] Refactors T-Ray Scanners
 2017-04-25 22:29:57 -05:00