Commit Graph

743 Commits

Author SHA1 Message Date
deathride58
ebc51d94bf Merge pull request #6119 from Citadel-Station-13/upstream-merge-36398
[MIRROR] [READY]pathfinding circuitry upgrade
2018-03-27 17:47:11 +00:00
arsserpentarium
303272319a [READY]pathfinding circuitry upgrade (#36398)
* all in one

* fixfixfix

* uhhhh

* demuxdemuxdemuxdemux

* wire eriw

* icon noci

* tihsxifixshit

* rewopower

* fixif

* screeneercs

* returnruter
2018-03-26 11:01:22 -05:00
kevinz000
4773743eab Fixes wet floor scaling (#36697)
* Fixes wet floor scaling

* Meh lets not
2018-03-26 10:49:42 -05:00
CitadelStationBot
c96253c376 [MIRROR] Fixes incorrect first death mob name (#6080)
* Fixes incorrect first death mob name

* Fixes incorrect first death mob name
2018-03-22 19:32:40 -05:00
CitadelStationBot
80d5cc2884 [MIRROR] Nerfs monkey spam (#6084)
* Merge pull request #36380 from vuonojenmustaturska/sauerbraten

Nerfs monkey spam

* Nerfs monkey spam
2018-03-22 19:31:57 -05:00
CitadelStationBot
99487a6bbb [MIRROR] April Fools Day replaces the overflow role with Clowns (#6041)
* April Fools Day replaces the overflow role with Clowns (#36533)

* Refactors overflow job assignment

* Fixes job selection

* April Fools Day replaces the overflow role with Clowns
2018-03-21 12:57:30 -05:00
deathride58
0d4e7f73f4 Merge pull request #6031 from Citadel-Station-13/upstream-merge-36466
[MIRROR] Unit test to make sure all subsystems which initialize call parent
2018-03-20 15:56:27 +00:00
Emmett Gaines
0832bb62c3 Unit test to make sure all subsystems which initialize call parent 2018-03-20 08:02:17 -05:00
Poojawa
8cbdf9fcb4 Merge branch 'master' into digileg-runtime 2018-03-19 21:33:50 -05:00
CitadelStationBot
009f95db42 [MIRROR] Electronic assembly changes and additions (#6014)
* Electronic assembly changes and additions

* Electronic assembly changes and additions (#36394)

* the rainbow of mediocrity rides again

* whoops that wasn't supposed to be there
2018-03-19 21:11:23 -05:00
Poojawa
d6e7dcdf37 Merge branch 'master' into digileg-runtime 2018-03-17 20:16:21 -05:00
Poojawa
c8365e6be7 Hunts down some runtimes
cleans up some dogborg sleeper code too
2018-03-17 19:38:03 -05:00
deathride58
0f5b8c228e Merge pull request #5975 from Citadel-Station-13/upstream-merge-36419
[MIRROR] Lavaland / Lavaplanet is now visible from space
2018-03-17 23:50:59 +00:00
Qustinnus
f7a8a96536 Lavaland / Lavaplanet is now visible from space (#36419)
* adds lava planet

* fixes oldcode

* im dumb

* Random position

* UHHHH, I'll take a diet lavaplanet please, no ice.

* fixes init
2018-03-17 07:54:21 -05:00
kevinz000
f78fea7333 [READY] Refactors wet floors to a component (#36130)
* Wet Floor components

* No more turf wet slide.
2018-03-17 07:53:11 -05:00
Poojawa
452b58d1a1 makes traits more paranoid, also removes the double application (#5929) 2018-03-14 17:28:42 -05:00
Poojawa
6c7da493d9 Reee mirror bot. Hard syncs some missed PR stuff + maps (#5951)
* maps and tgui

* missed defines and helpsers

* controller things

* datums

* game folder stuff

* module things

* icons

* stragglers

* map sync and updating

wew lad
2018-03-14 16:49:40 -05:00
CitadelStationBot
a58a8cdefb [MIRROR] Fixes client version config not working (#5935)
* Merge pull request #36350 from MrStonedOne/patch-490

Fixes client version config not working

* Fixes client version config not working
2018-03-13 05:45:34 -05:00
CitadelStationBot
c3edb62df9 [MIRROR] Hopefully fixes unnecessary nightshift announcements (#5923)
* Hopefully fixes unnecessary nightshift announcements (#36173)

* Hopefully fixes unnecessary nightshift announcements
2018-03-12 07:30:16 -05:00
Jordan Brown
ad6a3e810f Fix config loading exploit (#36286) 2018-03-10 14:52:18 -06:00
CitadelStationBot
e3831a684f [MIRROR] Replaces alien brain necropolis chest loot with new artifact [MERGE READY] (#5892)
* Replaces alien brain necropolis chest loot with new artifact [MERGE READY] (#36143)

* -Replaces alien brain necropolis chest loot with new artifact
-Adds new artifact to necropolis chests loot, the Rod of Asclepius
-Adds corresponding status effect and defines

* Update necropolis_chests.dm

fixed spelling

* Spelling FIx

*disperses

* Fixed spelling, lowered the boost to the owner, added oxy heals, and refactored some of the code

* Adds some form of sprites (Still subject to change)

* Adds new sprites, fixes slime people taking toxin damage, and adds the rod to list of snake phobia objects.

* Nerfed clone healing and simple animal healing, fixed healing while dead as well as added a death event, tweaked the sprites, and cleaned up some code.

* Fixed grammar and cleaned up some code.

* Further cleaned up code because Cobby is mean.

* FURTHER cleaned up code
p.s. please send help, Cobby is holding me hostage

* Replaces alien brain necropolis chest loot with new artifact [MERGE READY]
2018-03-10 07:43:42 -06:00
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