shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,210 Commits 5 Branches 0 Tags
754bb888dc1db567270605c92073ba7f514b60f4
Commit Graph

288 Commits

Author SHA1 Message Date
kevinz000
9096f03ad3 Merge pull request #8654 from Ghommie/Ghommie-cit54 
ports in the Hilbert's Hotel.
 2019-10-24 19:07:33 -07:00
Ghommie
e1928a18f1 Porting GetComponent macros removal, and some related changes. 2019-10-23 15:04:28 +02:00
Ghommie
31a6979c3c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 2019-10-06 21:54:15 +02:00
Ghommie
24fe7126c4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-08-24 19:05:51 +02:00
Ghommie
f843a53fe9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 2019-08-24 12:52:16 +02:00
kevinz000
411e0cc2cc Update on_move.dm 2019-08-12 00:17:31 -07:00
Fermi
ffa717e8d7 Prevents Eigenlockers from teleporting people to CC via cargoshuttle. 2019-08-04 19:39:14 +01:00
Ghommie
72413c893f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 2019-07-27 01:38:20 +02:00
kevinz000
08fd6af7fc Merge pull request #8830 from Ghommie/Ghommie-cit114 
Ports the toggleable dark mode to the game!
 2019-07-20 11:57:13 -07:00
Ghommie
dbb17a258a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 2019-07-15 17:52:34 +02:00
Ghommie
16a7f6e5b2 Merge branch 'master' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit54 2019-07-15 17:46:13 +02:00
Ghommie
1e1f8e627f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-07-15 17:33:41 +02:00
Ghommie
129ca9d71f Ports "Refactors NODROP flag into TRAIT_NODROP" 2019-07-13 10:27:39 +02:00
deathride58
82d527b760 Merge pull request #8765 from Ghommie/Ghommie-cit91 
Merging the end-of-shift and its shuttle autocall announcements into one.
 2019-07-08 18:04:27 -04:00
Ghommie
03315d1cbb Ports a toggleable darkmode to the game! 2019-07-05 22:29:50 +02:00
Ghommie
a2691e8f13 Ports "Add cancel button to assault pod destination selector" 2019-07-04 21:13:03 +02:00
Ghommie
ffecca8c11 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-07-03 03:24:28 +02:00
Ghommie
e61f13634e Merging the end-of-shift and its shuttle call announcements into one. 2019-06-27 04:23:14 +02:00
Ghommie
ba3a2c00bb ports in the Hilbert's Hotel. 2019-06-16 10:50:59 +02:00
Ghommie
af2598035a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-06-05 19:32:17 +02:00
Ghommie
0513f3464a one 2019-06-05 19:20:25 +02:00
Ghommie
d6e54bf237 Fixes and updates pod's emergency suits storage. 2019-06-02 18:28:30 +02:00
Tupinambis
e5e97302d4 Adds a new security level: Amber (#7976) 
* Adds the Amber security level.

* This isn't C
 2019-02-05 17:53:58 -08:00
Poojawa
cb342866d6 a few last minute changes from TG 
also changes His Grace from 25 to 10 requirments
 2018-09-18 23:12:29 -05:00
Poojawa
1a2460ed28 Continous update intergration until being merged 
Also tgui fixes/updates
 2018-09-15 00:37:29 -05:00
Poojawa
284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
deathride58
f1739cb482 Upstream fix mirror spree (#7362) 
* tgstation/tgstation#39025 - Fixes nukeop eshield not being buyable

* tgstation/tgstation#39011 - [s] Adds missing logging to the staff of storms

* tgstation/tgstation#38980 - Corrects a stat error in the Nuke Ops uplink

* tgstation/tgstation#38988 - Fixes blob victory.

* tgstation/tgstation#38990 - Allow players to un-ignore previously ignored popups for ghostroles, and ignore notifications with no ignore button

needs tgui recompile

* tgstation/tgstation#38994 - Fix timer bug

* TGUI recompile

* tgstation/tgstation#39035 - Fixes navigation computers.

* tgstation/tgstation#39043 - Fixes minor genetics scanner runtime

* tgstation/tgstation#39044 - Fixes burgers icons

* tgstation/tgstation#39055 - Fixes porta_turret and decal shuttle rotations

* tgstation/tgstation#39063 - Stops extinguishers from cooling turfs to absolute zero

* tgstation/tgstation#38967 - Fixes smuggler's satchel init typo

* tgstation/tgstation#38931 - Fixes pulse rifles exploding structures in nullspace and that sort of thing
 2018-07-20 03:40:39 -07:00
81Denton
1336a555d4 Disables knockdown/throw on supply shuttle docking (#38932) 2018-07-06 11:37:18 -05:00
deathride58
3e18d8208e Updates to tgstation commit 78e471d 2018-07-05 01:22:27 -04:00
deathride58
b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
LetterJay
af5a250ce4 Merge pull request #7282 from Citadel-Station-13/upstream-merge-38779 
[MIRROR] Fixes arrivals shuttle damage message runtime
 2018-07-01 09:39:28 -05:00
ShizCalev
6814022a1b Fixes arrivals shuttle damage message runtime (#38779) 2018-07-01 05:43:51 -05:00
Jordan Brown
c86a8ce23e Merge pull request #38709 from AutomaticFrenzy/patch/export-mechs 
Fix being unable to export mechs
 2018-06-25 14:12:24 -05:00
Jordan Brown
99fee78179 Makes a thing use its macro (#38556) 2018-06-18 19:16:43 -05:00
CitadelStationBot
03a22ca16d [MIRROR] Transit space refactor (#7130) 
* Transit space refactor

* Update bitfields.dm
 2018-06-18 11:51:02 -07:00
Jordan Brown
a70cbed1f7 Merge pull request #38527 from AutomaticFrenzy/patch/ripples 
Fix ripples appearing too broadly and disappearing too soon
 2018-06-18 09:38:42 -05:00
Tad Hardesty
a7b900425b [s] Prevent unbreakable ladders from being moved by shuttles (#38477) 
* Prevent unbreakable ladders from being moved by shuttles

* Disconnect ladders before and reconnect them after shuttle move
 2018-06-16 06:18:08 -05:00
deathride58
e279392386 Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128 
[MIRROR] Standardizes and cleans up some admin messages & logging
 2018-06-09 05:53:25 +00:00
deathride58
98fa9db020 Merge pull request #6971 from Citadel-Station-13/upstream-merge-38179 
[MIRROR] Fix Pubby auxiliary mining base
 2018-06-05 23:37:37 +00:00
deathride58
255ffb96bb Merge branch 'master' into upstream-merge-38179 2018-06-05 21:32:22 +00:00
deathride58
b49458e0ba Merge branch 'master' into upstream-merge-38116 2018-06-05 21:30:21 +00:00
Jordan Brown
5e15a988f6 Refactor machinery to default to being anchored 2018-06-01 11:28:19 -05:00
Jordan Brown
34f59b7a48 Merge pull request #38179 from AutomaticFrenzy/patch/pubby-aux 
Fix Pubby auxiliary mining base
 2018-06-01 09:48:37 -05:00
ShizCalev
4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -05:00
vuonojenmustaturska
7b6c75df28 Removes drone overlays and the associated code (#38175) 
* Remove drone overlays

4* animated multidir overlays per mob is a bit much

* to the orbit with you too
 2018-05-31 22:41:21 -05:00
deathride58
2f9e3e403d Hard upstream sync (#6951) 
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
 2018-05-31 16:03:18 -07:00
Jordan Brown
e5eaea8fe1 Merge pull request #38014 from tgstation/KorPhaeron-patch-1 
Fixes luxury shuttle forcefields vanishing
 2018-05-25 10:50:34 -05:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
Emmett Gaines
b866e62673 Fixes jumpToNullSpace (#37442) 
woops
 2018-04-27 13:05:44 -05:00
Poojawa
5518efebea everything but mob stuff 2018-04-23 01:06:17 -05:00