Commit Graph

1372 Commits

Author SHA1 Message Date
CitadelStationBot
93d8756a70 [MIRROR] NAMEOFs some things (#5877)
* NAMEOFs some things (#36263)

* NAMEOFs some things
2018-03-10 07:38:37 -06:00
deathride58
936c6a33f2 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-35475 2018-03-09 14:18:47 -05:00
deathride58
a4751b0e94 Merge pull request #5868 from Citadel-Station-13/upstream-merge-36289
[MIRROR] [s] Stop qdeling shit you're not supposed to
2018-03-09 18:39:51 +00:00
deathride58
8728d99ef9 Merge pull request #5866 from Citadel-Station-13/upstream-merge-36287
[MIRROR] [S] Fixes GLOB protected vars exploit
2018-03-09 18:39:19 +00:00
deathride58
78db80026d Merge pull request #5840 from Poojawa/reverts-crybaby-inducer
Reverts crybaby inducer also does the sync things
2018-03-09 18:36:42 +00:00
vuonojenmustaturska
ba5b5b433e Merge pull request #36289 from tgstation/Cyberboss-patch-4
[s] Stop qdeling shit you're not supposed to
2018-03-09 10:44:46 -06:00
vuonojenmustaturska
27928bb1bf Merge pull request #36287 from tgstation/Cyberboss-patch-4
[S] Fixes GLOB protected vars exploit
2018-03-09 09:07:35 -06:00
Dax Dupont
27ff0a4f28 Display cases can now have a list where to randomly spawn items from (#36058)
* Adds allowing display cases to pick from a random list

Keeps compatibility with older maps and moves trophy/plaque message to all display cases

* A bit more legible

* Refactors statues tool interaction code

* Don't override it already exists

* done
2018-03-09 02:17:36 -06:00
Qustinnus
a96a28f3d6 [reviewpls] Adds moodlets to the game - [Please give suggestions for trait additions in comments] 2018-03-07 20:49:25 -06:00
Tad Hardesty
6402912a32 Allow configuring ruin/empty space level count - #36191
Allows map configs to set how many ruin levels (def. 7) and how many empty levels (def. 1) that will be created. Most useful for landlocked stations, event/one-off stations with unusual composition, or testing situations such as RuntimeStation.
2018-03-07 01:48:13 -06:00
Poojawa
95cb6b23f2 controllers, datums, game 2018-03-06 21:16:46 -06:00
Poojawa
86b11050b6 Citadel's folder's end (#5828)
* ERP, miscreants, clothing

* github pls

* guns, dogborg, areas, vendor

* finishes moving around the last of the stuffs

* cleaned up shit. italics on subtle messages

vore code to modular_citadel too

* updates codeowners and recompiles tgui

because it's a healthy thing to do

* reee, I had that spawner set byond

* cleans up a bad pipe

does the thing I've been meaning to do for a while now as well.

* bumps up xenobio console requirements

inb4 reee

* snowflake commenting
2018-03-06 17:40:48 -06:00
Poojawa
6e5131cfc5 Vore code to json and more (#5789)
* Vore 2.0

Initial commit

* double checked porting

* Fixes compile issues

* converts Ash Drake bellies to new system

digs out lingering datum/belly stuff too

* Let's just work on this later

* System operational

* Update preferences.dm
2018-03-06 03:59:31 -06: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
c8107c52cc [MIRROR] Adjusts fire priorities of flightpacks, research, networks, and fields. (#5809)
* Adjusts fire priorities of flightpacks, research, networks, and fields. (#36129)

* Fire priorities

* research lower not higher

* Don't need to keep timing if it's automatically compensating for missed ticks.

* Spelling

* spelling

* Adjusts fire priorities of flightpacks, research, networks, and fields.
2018-03-05 13:01:49 -06:00
CitadelStationBot
fef85c1eb3 [MIRROR] Fix nightshift skipping certain maint APCs (#5811)
* Merge pull request #36082 from AutomaticFrenzy/patch/nightshift-fix

Fix nightshift skipping certain maint APCs

* Fix nightshift skipping certain maint APCs
2018-03-05 12:30:29 -06:00
Jordan Brown
c87455f5a3 Prevents history from repeating itself (#36110)
* Prevents history from repeating itself

* It persisteh
2018-03-04 15:00:48 -06:00
CitadelStationBot
d3905c723f [MIRROR] Add support for auto admin when ran in single user mode (#5762)
* Add support for auto admin when ran in single user mode

* Update client_procs.dm

* fixes compile issues, also adds in some legacy mentor code
2018-03-04 13:06:42 -06:00
LetterJay
f467484236 Merge pull request #5754 from Citadel-Station-13/upstream-merge-35485
[MIRROR] Antagonist reputation system
2018-03-04 00:31:41 -06:00
LetterJay
863585f477 Merge pull request #5753 from Citadel-Station-13/upstream-merge-35440
[MIRROR] Adds minor roundstart traits! (ala CDDA, etc.)
2018-03-02 23:37:41 -06:00
CitadelStationBot
7d9dbcd0c3 [MIRROR] [s] Where were you, the day cyberboss exposed the database password to all admins with a holder (#5761)
* Merge pull request #36104 from MrStonedOne/blamecyberboss

[s] Where were you, the day cyberboss exposed the database password to all admins with a holder

* [s] Where were you, the day cyberboss exposed the database password to all admins with a holder
2018-03-02 20:03:17 -06:00
Sirenfal
44dc6ac3a0 Antagonist reputation system 2018-03-02 14:38:26 -06:00
Ashe Higgs
0a449af83e Adds minor roundstart traits! (ala CDDA, etc.) 2018-03-02 14:38:18 -06:00
vuonojenmustaturska
afb1ab021b Removes SNPCs (#36016)
* he's dead, jim

* a few stragglers

* Restores the populate world-verb
2018-02-28 00:12:12 -06:00
MMMiracles
5493339c7d Adds Tinfoil Hats (#35665)
* adds a tinfoil hat to protect you from government conspiracies and aliens

* qutoes ples

* In the sheets of my sterilized room
In your comfy bed, air-conditioned car
There are vapors and toxins to get you all
In the water you drink, in the air that you breath
In the soil under your shoe

* conspiracy phobia, nodrop on hat once equipped, also CONTRAST

* a single comma

* cyberboss changes

* |=

* central typo fix
2018-02-25 18:11:48 -06:00
Jordie
51a70bcd4f Fixes first_death check (#35944)
* Update blackbox.dm

* Update blackbox.dm
2018-02-25 14:03:45 -06:00
CitadelStationBot
b7015c379a [MIRROR] Cleans up some time stuff with DisplayTimeText (#5685)
* Cleans up some time stuff with DisplayTimeText

* Update hot_potato.dm
2018-02-24 07:02:45 -06:00
CitadelStationBot
952dfb4be3 [MIRROR] Changes station time to real time rate multiplier from 24 to 12 (#5667)
* Changes station time to real time rate multiplier from 24 to 12

* Update ticker.dm
2018-02-24 06:04:47 -06:00
LetterJay
6ce5985f9f Merge pull request #5638 from Citadel-Station-13/upstream-merge-35775
[MIRROR] [READY]Randomized Station Time + Night Shifts
2018-02-24 00:24:47 -06:00
CitadelStationBot
21a9d4bca4 [MIRROR] [READY]Astar improvement (#5646)
* [READY]Astar improvement (#34713)

Improvements to A* via using bitflags to find directions and caching already checked directions so we don't recheck them.

* [READY]Astar improvement
2018-02-21 19:46:54 -06:00
CitadelStationBot
03dfbe7137 [MIRROR] Ports Barometers from Yogstation (#5647)
* Ports Barometers from Yogstation (#35730)

* Ports Barometers from Yogstation

* Ports Barometers from Yogstation

* Added missing barometer_predictable bools

* Gives the atmos analyzer love instead of a new item.

* Moves playsound under cooldown to prevent soundspam.

* Ports Barometers from Yogstation
2018-02-21 19:44:20 -06:00
Jordan Brown
bc2f2a9728 [READY]Randomized Station Time + Night Shifts 2018-02-21 12:02:28 -06:00
Jordie
b031f73ef4 Removes duplicate first death log (#35832)
* Update blackbox.dm

* Update death.dm

* Update ticker.dm
2018-02-20 18:58:48 -06:00
deathride58
93a90664b7 Merge pull request #5613 from Citadel-Station-13/upstream-merge-35792
[MIRROR] Fixes multiserver mining formula
2018-02-20 15:26:49 +00:00
deathride58
cee4822b2a Merge pull request #5609 from Citadel-Station-13/upstream-merge-35436
[MIRROR] Adds several new phobias
2018-02-20 15:25:19 +00:00
Jordan Brown
c36f144d9e Merge pull request #35792 from DaedalusGame/bitconnect
Fixes multiserver mining formula
2018-02-19 22:09:55 -06:00
Anonmare
b9f3dd587a Adds several new phobias (#35436)
[Changelogs]: Adds four five several new phobias to the ones you might receive, careful, you don't want to be a cultist afraid of your own God now, do you?

cl
add: Nanotrasen psychologists have identified new phobias emerging amongst the workforce. Nanotrasen's surgeon general advises all personnel to just buck up and deal with it.
/cl

[why]: Because I think it would be fun and makes traumas more... Traumatising?
2018-02-19 22:09:17 -06:00
Ashe Higgs
7496feb40f The end-round report now shows the name, area, ckey, damage taken, and last words of the first person to die that round (#35582)
* Adds a "first death" feature to the roundend

* no clogging up with antag-rollers

* fixes red text color

* Maintainer review (finally, sorry)
2018-02-19 22:08:52 -06:00
deathride58
d2e13833d6 Merge pull request #5496 from Citadel-Station-13/upstream-merge-35339
[MIRROR] Support stations with multiple z-levels
2018-02-17 21:24:48 +00: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
Tad Hardesty
5b30b29a4b Support stations with multiple z-levels (#35339)
* Remove ZLEVEL_STATION_PRIMARY

* Add Up and Down traits for use by ladders and chasms

* Give map_config creation its own proc

* Combine LoadConfig and ValidateJSON and remove transition_config

* Make space linkage a z-level trait

* Remove ZLEVEL_EMPTY_SPACE

* Update uses of GetFullMapPath

* Handle multi-Z stations and load Lavaland and Reebe at runtime

* Remove unused space maps

* Fix inappropriate z-expansion in map reader, improve logging

* Update comments relating to z-level configuration

* Add Lavaland and Reebe to ALL_MAPS
2018-02-15 10:39:08 -06:00
vuonojenmustaturska
e6487cc5ef Merge pull request #35692 from Cyberboss/GarbagePreInit
Moves garbage up in the init order
2018-02-15 10:38:02 -06:00
AnturK
38145c93c7 Greentext antag datum and OnRoundend hook. (#35584)
* Greentext antag datum and OnRoundend hook.

* review stuff
2018-02-13 19:43:54 -06:00
Robustin
1825c944b6 Cult Update? Cult Update! (#35433)
* Cult Fixes and Tweaks

* Master prompt and spelling fix

* Couple small fixes
2018-02-12 15:18:21 -06:00
Jordan Brown
bed3f556c8 Removes runlevels spec from SSoverlays (#35455) 2018-02-10 11:02:20 -06:00
Kyle Spier-Swenson
ca9ac1bdc1 Fixes map configuration values for nonexistent maps applying to box
This caused box'es min pop to get set to 50 because all of the servers still had cere defined with that limitation.
2018-02-09 18:13:12 -06:00
Jordan Brown
5a3b322d43 Atom initialization counter only shows up in TESTING mode (#35428) 2018-02-08 16:12:53 -06:00
deathride58
7b46f951cc Re-enables round autoend 2018-02-05 14:17:14 -05:00
CitadelStationBot
a5d1cae1ac [MIRROR] Fixes smugglers satchels being able to refresh items forever (#5313)
* Fixes smugglers satchels being able to refresh items forever (#35270)

* Fixes smugglers satchels being able to refresh items forever
2018-02-05 00:48:12 -06:00
CitadelStationBot
60292af57f [MIRROR] Disentangles Command Reports from Metagame (#5294)
* Disentangles Command Reports from Metagame (#35192)

* False report fix

* Less Accurate Command Report

* Disentangles Command Reports from Metagame
2018-02-04 23:11:32 -06:00