Commit Graph

69 Commits

Author SHA1 Message Date
Artur
8b8a112d2c Ohkay 2020-01-15 09:41:33 +02:00
Useroth
35846c452a Applied suggestions and minor tweaks. 2019-12-26 20:03:43 +01:00
Lin
1ddb9935ff Merge pull request #9530 from Ghommie/Ghommie-cit245
Touching up job outfits equip procs, little PDA fix.
2019-11-22 02:37:49 +00:00
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
986c4e11c0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit245 2019-11-02 02:32:23 +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
69f27e19fe Touching up job outfits equip procs, little PDA fix. 2019-10-18 18:02:24 +02: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
fe2abc990b Fixes new player runtime that makes people unable to join rounds. 2019-07-06 04:51:56 +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
deathride58
e4c5f005a0 makes DNR apply properly to ghost roles and midround antags 2019-03-15 16:26:17 -04: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
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
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
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
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
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
Jordan Brown
fd479e7128 Replaces some var values with defines 2018-02-10 11:11:09 -06:00
Poojawa
03086dfa91 Tg 1 28 sync testing/confirmation (#5178)
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
2018-01-29 04:42:29 -06:00
deathride58
0dbc2241ea modules: A to C 2018-01-04 00:46:53 -05:00
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1 TG Sync 12/15/17
s

s
2017-12-15 06:27:57 -08:00
ACCount
435e46e407 Moves some machine sprites into /machines/ folder 2017-12-05 03:24:03 -06:00
oranges
43113cd9b5 Merge pull request #31947 from AnturK/yarr
How does this work:
Station receives a communication extorting current cargo point, if they answer yes the points are just gone and nothing of interest happens.

If station refuses to pay or is silent for 3 minutes, pirate shuttle spawns somewhere in space.

    There's an internal GPS onboard so crew will always be able to follow the shuttle.
    Crew of 3, moderately armed. (Balance pending)
    Shuttle engines have 3 minute cooldown between jumps.
    Special shuttle equipment will block cargo and emergency shuttles from leaving and slowly steal the points.
2017-11-13 03:19:38 -06:00
bawhoppen
f8bd9ecf9c Fixes old simple animal humanoid issues (#32214)
* fixes issue

* ignore that

* Spacebattle doesn't even open in DM

* Conflicts fixed for real

* Fixes pathing weirdness

* wonderful
2017-10-30 06:50:04 -05:00
CitadelStationBot
3e1031d6b9 Adds a ghost verb to see all available ghost spawners 2017-08-29 17:45:50 -05:00
LetterJay
188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
CitadelStationBot
609ae007ae Changes all access const to be a define 2017-07-16 11:44:47 -05:00
CitadelStationBot
ff6bbbedf5 Changes some 1s and 0s to TRUE and FALSE (#1967) 2017-07-10 16:13:16 -07:00
CitadelStationBot
2da7322cca [MIRROR] Gives ghost roles their own assigned_roles (#1887)
* Gives ghost roles their own assigned_roles

* Update ghost_role_spawners.dm

* Delete ghost_role_spawners.dm.rej
2017-07-06 14:15:12 -05:00
Poojawa
b1b4826c0c July 5th TG sync (#1883)
July 5th TG sync
2017-07-05 22:14:19 -05:00
LetterJay
962177c423 Merge branch 'master' into upstream-merge-27652 2017-06-05 23:16:40 -05:00