Commit Graph

176 Commits

Author SHA1 Message Date
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
KorPhaeron 0c6aea73d3 Can't push CTF flag carriers (#37321) 2018-04-22 19:19:32 -05:00
vuonojenmustaturska 32fe9d4fd6 Couple of fixes for situations involving mechas and the clock cult gamemode (#37218)
* couple of mech fixes

* safety

* gateway, gravity gen

* Restores oingo-boingo punch-nuke
2018-04-18 09:33:31 -05:00
Poojawa 5fa001c10f things with stuff (#6233)
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
2018-04-07 23:07:09 -04:00
Armhulen 2d8b007086 Refactors Spell and Martial Art Books to use Action Granters! 2018-03-28 12:18:06 -05:00
CitadelStationBot a2e6253f00 [MIRROR] Disease antagonist (#5815)
* Disease antagonist

* Update mobs.dm

* can I go to sleep yet
2018-03-05 15:20:59 -06:00
CitadelStationBot 567c7fad8d [MIRROR] Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold (#5674)
* Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold (#35796)

* - Stop subtracting from bodytemp please
- Also fixes shivering

* - Jesus christ why did you make me do this

* - missed one

* Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold
2018-02-23 17:42:57 -06:00
CitadelStationBot fe8b463203 [MIRROR] Fixes the sensor corpse runtimes. (#5627)
* Merge pull request #35837 from AnturK/sensorbadcode

Fixes the sensor corpse runtimes.

* Fixes the sensor corpse runtimes.
2018-02-21 09:28:34 -06:00
Jordan Brown ff0f8189c5 Merge pull request #35804 from DaedalusGame/ghost-rolling
Fixes ghost role spawners still showing up in the spawner menu even if they're deleted
2018-02-19 22:07:34 -06:00
deathride58 f072def90e Merge pull request #5533 from Citadel-Station-13/upstream-merge-35673
[MIRROR] All medal methods are handled on SSmedals as opposed to global procs and also have proper defines, killing with a crusher grants special medals.
2018-02-17 20:44:57 +00:00
deathride58 e9f6fb08bd Merge pull request #5539 from Citadel-Station-13/upstream-merge-35731
[MIRROR] Map spawned corpses start with their suit sensors turned off
2018-02-17 19:31:34 +00:00
deathride58 fb65a98117 Merge pull request #5516 from Citadel-Station-13/upstream-merge-35668
[MIRROR] Quote the armor lists
2018-02-17 19:29:50 +00:00
LetterJay 92526a4a94 Update corpse.dm 2018-02-17 11:47:24 -06:00
LetterJay 06dd2e2aa5 Update corpse.dm 2018-02-17 09:58:42 -06:00
TankNut a918a06478 Map spawned corpses start with their suit sensors turned off 2018-02-17 08:54:04 -06:00
Leo a5650cccc4 All medal methods are handled on SSmedals as opposed to global procs and also have proper defines, killing with a crusher grants special medals. 2018-02-16 12:18:21 -06:00
AnturK 3e12e1b2f6 Some antag fixes. (#35690)
* Removes misleading comment

* Fixes devil ascension visible in lobby

* Fixes nuke op reinforcements.

* ADVANCED COPYPASTE

* Missed this one.
2018-02-16 10:35:55 -06:00
AnturK 993f15a415 Converting more auto_custom antagonists. (#35484)
* Thinning out auto_custom uses.

* Not sure what i was thinking.

* Not sure what happened here.

* Fixes

* Forgot i'm doing this so i can remove this

* C

* Valentine antag datums

* This is what i get for adding it manually.
2018-02-16 00:45:20 -06:00
Jordan Brown f9353da855 Quote the armor lists 2018-02-16 00:26:26 -06:00
Jordan Brown e2b4e3c567 Fixes wrong ID for syndicate ghost roles 2018-02-11 15:35:14 -06:00
Jordan Brown fd479e7128 Replaces some var values with defines 2018-02-10 11:11:09 -06:00
CitadelStationBot 717da969a6 [MIRROR] Var cleanup and map fixes (#5359)
* Merge pull request #35429 from ShizCalev/snowdin-cleanup

Var cleanup and map fixes

* Var cleanup and map fixes
2018-02-07 20:04:04 -06:00
CitadelStationBot 7126b61205 [MIRROR] Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag (#5327)
* Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag

* really? Like, a dozen fucking map conflicts. this map was fucked entirely
2018-02-06 19:06:31 -06:00
MMMiracles 4c6bdf1a9e Snowdin 2.0 2018-02-05 09:10:40 -06:00