shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,836 Commits 5 Branches 0 Tags
6d6cc93e50ed1ab15fa4040739f64efef7eec6a0
Commit Graph

199 Commits

Author SHA1 Message Date
kevinz000
af0962088c Merge pull request #9453 from Ghommie/Ghommie-cit226 
Mitigates the ghost roles/mid-round antag lock out for suicide/cryo. And related fixes.
 2019-11-14 15:47:18 -07:00
Ghommie
4c1eba0d81 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit226 2019-11-10 23:52:48 +01:00
Ghommie
1e49ce76d3 Dreamchecker compatibility changes, part 1. 2019-11-10 20:48:30 +01:00
Ghommie
8c31c1036d Porting objective code refactor 2019-11-04 22:05:04 +01:00
Ghommie
f01b5c853f Unmodularize lavaknights. 2019-10-24 22:08:36 +02:00
Ghommie
ec22088534 Complying with suggestions. Also stops dnr observers from getting ghost role notifications 2019-10-20 09:15:35 +02:00
Ghommie
aa6860250b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit226 2019-10-15 20:40:07 +02:00
kevinz000
f686ea75d3 Merge pull request #8615 from Ghommie/Ghommie-cit45 
Virtual reality componentization.
 2019-10-10 02:09:51 -07:00
Ghommie
b4e975ef75 mitigates the ghost roles/mid-round antag lock out for suicide/cryo. And related fixes. 2019-10-09 06:51:07 +02:00
Ghommie
32a73b24c0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11 2019-10-05 18:22:43 +02:00
Ghommie
5d1cac62da Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-08-24 13:50:22 +02:00
Ghommie
6c712a6931 Implementing nerfs. 2019-07-24 17:58:24 +02:00
Ghommie
fac3e65c68 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11 2019-07-15 17:42:47 +02:00
Ghommie
4df4cbd721 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-07-15 17:23:01 +02:00
Ghommie
129ca9d71f Ports "Refactors NODROP flag into TRAIT_NODROP" 2019-07-13 10:27:39 +02:00
Ghommie
fe2abc990b Fixes new player runtime that makes people unable to join rounds. 2019-07-06 04:51:56 +02:00
Ghommie
a3ab5f6d23 Moving the snowflake mob var to the component and finalizing. 2019-07-04 02:03:51 +02:00
Ghommie
c58efa64c1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-07-03 02:36:23 +02:00
Ghommie
d0a001f663 Quickfixing latejoin ghost roles, I'm sorry. 2019-07-01 22:47:51 +02:00
Ghommie
d782f24395 change 2019-06-28 17:30:28 +02:00
Ghommie
a90ef6faa3 and it's gone. 2019-06-27 15:06:04 +02:00
Ghommie
b168a8c294 Fixes CWC construct shells being visible as ghost role to latejoiners. 2019-06-23 08:03:56 +02:00
Ghommie
3cbe9cf6b0 componentization part 1: "The flawed theorical code" 2019-06-10 22:37:38 +02:00
Ghommie
f220f1cb12 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11 2019-04-10 16:05:22 +02:00
Ghommie
ced2ee0ad0 Painbow extract. Cluwne. 2019-03-19 14:48:35 +01:00
deathride58
e4c5f005a0 makes DNR apply properly to ghost roles and midround antags 2019-03-15 16:26:17 -04:00
kevinz000
1034a6ad0e ball stuff 2018-12-16 03:41:37 -08:00
deathride58
73ae6badb6 actually fixes ghost role spawners leaving null entries in mob_spawners 2018-11-20 22:24:47 -05:00
deathride58
857c21a378 Fixes spawners with defined job descriptions causing the mob spawners list to fill up with null entries (makes spawner menu work again and properly removes ghost roles from latejoin menu when filled) (#7736) 
* Fixes the mob spawner list being filled with null entries. (Fixes spawner menu and stops latejoin menu from showing filled ghost roles)

* oop hang on
 2018-11-18 16:03:00 -08:00
deathride58
402a5ba9e4 Makes it plausible to join as ghost roles from the latejoin menu (#7726) 
* Makes it plausible to join as ghost roles from the latejoin menu

* Clarifies a little bit of the text
 2018-11-16 14:47:42 -08:00
Poojawa
d231018a3a Flashy flash and Gondola Pods 
and cult effect addition, fixes CTF
 2018-09-21 02:48:17 -05:00
Poojawa
b00a76476c Oh hey, all of those compile fixes 2018-09-11 11:00:18 -05:00
Poojawa
284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
Tupinambis
02a86dd2a0 New Alien Lavaland Ruin (#7455) 
* Removes the old "xeno nest" lavaland ruin that currently is blacklisted on the live server, and replaces it with a new "alien nest" ruin.

* Tiny ruin description change.

* Removed all organs scattered around the nest, and replaced them with corpses you must harvest the organs from. Also slightly changes the loot and the locations of said loot.

Drone and Queen corpse spawners have been added.

* Removed xenomorph queen corpse, moved drone corpse into a location that is harder to cheese. Added "Hive's Blessing" (Syringe containing alien microbes.)
 2018-08-23 00:26:32 -07:00
deathride58
b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
81Denton
241d0c7a9a Adds dance machine, drink dispensers, flavor to beach bum ruin (#38533) 
* shit was SO cash

* correct dance machine subtype

* moves defines from map file to corpse.dm

* improves bartender flavor text

* adds special shadycigs for beach ruin, adds shower, moves bartender sleeper to backroom
 2018-06-18 09:37:48 -05:00
oranges
1d0f775f56 Merge pull request #38360 from ShizCalev/key-cleanup 
Cleans up some logging
 2018-06-11 22:29:27 -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
Jordan Brown
5e15a988f6 Refactor machinery to default to being anchored 2018-06-01 11:28:19 -05:00
ShizCalev
4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -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
LetterJay
e4eb4939b4 Merge pull request #6636 from Citadel-Station-13/upstream-merge-37582 
[MIRROR] Makes more messages pronoun sensitive
 2018-05-23 07:46:26 -05:00
LetterJay
06b7cdf27a Merge branch 'master' into upstream-merge-37529 2018-05-22 08:02:46 -05:00
LetterJay
5f27ac30c7 Merge branch 'master' into upstream-merge-37582 2018-05-22 07:22:42 -05:00
deathride58
6a07a66cb3 Merge branch 'master' into upstream-merge-37476 2018-05-06 07:07:02 +00:00
ShizCalev
b5a95e9da8 Makes more messages pronoun sensitive 2018-05-03 17:46:25 -05:00
Jordan Brown
d9c368a2a4 Merge pull request #37562 from AutomaticFrenzy/patch/corpse-runtimes 
Fix runtimes in corpse code due to mob_spawners becoming null
 2018-04-30 21:19:22 -05:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
vuonojenmustaturska
f373b2c9e6 Kills off three more flags from flags_2 2018-04-29 17:30:55 -05:00
oranges
7d45e045a3 Uppercases slot defines. 2018-04-27 20:14:39 -05:00