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

173 Commits

Author SHA1 Message Date
CitadelStationBot
53fb384b63 Emagging a cloner drops bits, cloners don't keep extra flesh (#1264) 2017-05-28 15:22:10 -07:00
CitadelStationBot
fa42d8631a Comm Console Fix 2017-05-27 23:27:19 -05:00
CitadelStationBot
833c0c549c Make dance machine mob dancing asynchronous (#1221) 2017-05-27 13:35:52 -07:00
CitadelStationBot
740f172772 Fixes airlocks having two Initializes (#1198) 2017-05-27 13:32:49 -07:00
CitadelStationBot
c9ab875da9 Ports clonepods to Initialize (#1230) 2017-05-27 13:26:59 -07:00
LetterJay
ef018fb14d Merge pull request #1182 from Citadel-Station-13/upstream-merge-27627 
[MIRROR] Xenobio console origin tech fix
 2017-05-26 23:24:08 -05:00
LetterJay
bf735e5df7 Merge pull request #1192 from Citadel-Station-13/upstream-merge-27658 
[MIRROR] Fixes adv camera leaving obscured images
 2017-05-26 23:22:54 -05:00
LetterJay
bb7a3462f0 Merge pull request #1199 from Citadel-Station-13/upstream-merge-27668 
[MIRROR] Makes a thing use QDEL_NULL
 2017-05-26 23:21:44 -05:00
CitadelStationBot
15482314d4 Makes a thing use QDEL_NULL 2017-05-26 18:03:21 -05:00
CitadelStationBot
5387b4e2a7 Makes a thing use QDEL_NULL 2017-05-26 13:20:50 -05:00
CitadelStationBot
fa4e0e61d6 Fixes adv camera leaving obscured images 2017-05-26 09:05:52 -05:00
CitadelStationBot
e2b1ef2ad2 Xenobio console origin tech fix 2017-05-25 09:44:40 -05:00
CitadelStationBot
7998cdcd9a Gang Icons and Fixes 2017-05-25 08:45:28 -05:00
LetterJay
869953cd18 Merge pull request #1123 from Citadel-Station-13/upstream-merge-27503 
[MIRROR] Changes investigate logs to use a define
 2017-05-24 12:34:36 -05:00
LetterJay
57f9345ace Merge pull request #1135 from Citadel-Station-13/upstream-merge-27543 
[MIRROR] Fixes advanced cam not cleaning up properly
 2017-05-24 12:12:16 -05:00
LetterJay
006c74c6ae Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27503 2017-05-24 08:11:07 -05:00
CitadelStationBot
be2aefa13b Fixes syndicate pod turrets 2017-05-23 20:56:33 -05:00
CitadelStationBot
3651637cd8 Fixes advanced cam not cleaning up properly 2017-05-23 13:44:19 -05:00
LetterJay
b633ef0991 Merge pull request #1130 from Citadel-Station-13/GangSync 
Syncs all gang related PRs with upstream
 2017-05-23 06:17:29 -05:00
LetterJay
b85d2ea321 Syncs all gang related PRs with upstream 2017-05-23 06:10:40 -05:00
CitadelStationBot
01cd2039e5 Changes investigate logs to use a define 2017-05-22 22:45:54 -05:00
CitadelStationBot
4ac787e3bb Adds a toy weapon vendor into the syndie lavaland base firing range 2017-05-22 22:10:47 -05:00
Poojawa
45ba084c6a Merge branch 'master' into upstream-merge-27344 2017-05-20 23:26:28 -05:00
LetterJay
cb5e0eba3a Merge pull request #1039 from Citadel-Station-13/upstream-merge-27367 
[MIRROR] Quick fix for AI language issues.
 2017-05-19 01:00:41 -04:00
LetterJay
96710c56e1 Merge pull request #1046 from Citadel-Station-13/upstream-merge-27292 
[MIRROR] Fixes clicking things under windows/doors.
 2017-05-18 23:46:08 -04:00
LetterJay
11b4a00322 self merge 2017-05-18 22:43:55 -05:00
LetterJay
50df0e608b Merge pull request #1038 from Citadel-Station-13/upstream-merge-27361 
[MIRROR] Vending machines are more dangerous when throwing items
 2017-05-18 23:40:42 -04:00
LetterJay
10fa3fe530 Merge pull request #1036 from Citadel-Station-13/upstream-merge-27252 
[MIRROR] Fixes bypassing cargo export values on minerals
 2017-05-18 23:40:21 -04:00
LetterJay
ee6c2435ac Merge pull request #1033 from Citadel-Station-13/upstream-merge-27369 
[MIRROR] Fixes some holocall issues
 2017-05-18 23:39:45 -04:00
CitadelStationBot
a430e24555 Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual 2017-05-18 16:38:09 -05:00
CitadelStationBot
c6a9bdb4b2 Fixes clicking things under windows/doors. 2017-05-18 16:37:50 -05:00
CitadelStationBot
79655b17e5 Quick fix for AI language issues. 2017-05-18 16:37:22 -05:00
CitadelStationBot
670a6f2126 Vending machines are more dangerous when throwing items 2017-05-18 16:37:18 -05:00
CitadelStationBot
9896c98935 Fixes bypassing cargo export values on minerals 2017-05-18 16:37:11 -05:00
CitadelStationBot
90d96dba06 Fixes some holocall issues 2017-05-18 16:36:58 -05:00
CitadelStationBot
5956761df8 Adds a new toy to arcade prizes. A rumbling toy toolbox meant to mimic hisgrace 2017-05-18 16:36:43 -05:00
CitadelStationBot
a5f858d8fb [MIRROR] Adds an underlay to turrets which gives them a base (#1002) 
* Adds an underlay to turrets which gives them a base

* Update turrets.dmi
 2017-05-18 13:12:17 -05:00
CitadelStationBot
45d9ea57a7 Fixes fixing fire alarms (#996) 2017-05-18 12:06:22 -05:00
CitadelStationBot
33941c29c8 [MIRROR] People can be cloned from heads or brains (#919) 
* People can be cloned from heads or brains

* .rej fixes

* Update cloning.dm
 2017-05-18 09:49:26 -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
6617f68604 [MIRROR] Harvesters are more fun to play (#894) 
* Harvesters are more fun to play

* resolve .rej
 2017-05-18 07:12:29 -05:00
CitadelStationBot
6a2916a171 [MIRROR] Bluespace Launchpads (#879) 
* Bluespace Launchpads

* Delete runtimestation.dmm.rej

* Delete tgstation.dme.rej

* Delete tgui.js.rej

* Update tgui.js
 2017-05-18 07:12:13 -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
47fa8353eb [MIRROR] Moves playsound_local() to mob and gets rid of a useless proc. (#710) 
* Moves playsound_local() to mob and gets rid of a useless proc.

* Fixes compile errors
 2017-05-18 01:39:16 -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
LetterJay
fe582cad7c Merge pull request #989 from Citadel-Station-13/upstream-merge-27214 
[MIRROR] Updates starthistle plant description & stats, adds a seed return harvest, fixes sprites & adds starthistle seeds to the botany vendor contraband
 2017-05-17 10:50:20 -04:00
LetterJay
1948b007d1 fix roundstart/rej cleanup 2017-05-17 05:08:51 -05:00
LetterJay
bdbedd33f4 Merge branch 'master' into upstream-merge-26776 2017-05-17 05:14:18 -04:00
LetterJay
f978e3d56e rej cleanup 2017-05-17 03:50:34 -05:00