Commit Graph

5409 Commits

Author SHA1 Message Date
deathride58
fdbd8aec97 Merge pull request #5869 from Citadel-Station-13/upstream-merge-36288
[MIRROR] You can no longer SDQL select certain datums
2018-03-09 18:40:09 +00:00
deathride58
2a92653e68 Merge pull request #5867 from Citadel-Station-13/upstream-merge-36290
[MIRROR] [s] Guards client.holder
2018-03-09 18:39:35 +00:00
deathride58
1387c8e3b6 Merge pull request #5855 from Citadel-Station-13/upstream-merge-35858
[MIRROR] Mushroom people, revived!
2018-03-09 18:37:29 +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
bf63e9ad3f Merge pull request #36288 from Cyberboss/BansKevinzFinally
You can no longer SDQL select certain datums
2018-03-09 10:45:58 -06:00
vuonojenmustaturska
f25ed2503e Merge pull request #36290 from tgstation/Cyberboss-patch-5
[s] Guards client.holder
2018-03-09 10:28:17 -06:00
LetterJay
ad0be11cbc Merge pull request #5865 from Citadel-Station-13/upstream-merge-36073
[MIRROR] [READY AND TESTED]Projectiles now properly delete themselves if they try to move and their trajectory is at an invalid turf
2018-03-09 04:53:41 -06:00
LetterJay
2f2aed48e4 Merge pull request #5864 from Citadel-Station-13/upstream-merge-36051
[MIRROR] The ARM is now harder to obtain
2018-03-09 04:53:23 -06:00
LetterJay
0e2531faaf Merge pull request #5861 from Citadel-Station-13/upstream-merge-36106
[MIRROR] To go even further byond... the above lighting layer!
2018-03-09 04:52:32 -06:00
LetterJay
c86aeef909 Merge pull request #5860 from Citadel-Station-13/upstream-merge-36195
[MIRROR] Minor say code cleanup
2018-03-09 04:52:18 -06:00
kevinz000
0905f68bbc Projectiles delete on invalid turf (#36073) 2018-03-09 02:26:05 -06:00
Robustin
e9d3af6e61 The ARM is now harder to obtain (#36051)
* Added ARM difficulty

* Working edition Pt1

* Actually working Pt2

* Appropriate null check?

* Update narsie.dm
2018-03-09 02:17:46 -06:00
astralloop
e8548b392b To go even further byond... the above lighting layer! (#36106)
* This, is my normal form.

* THIS, IS A SUPER SAIYAN ASCENDED.

I CALL IT A SUPER SAIYAN 2

* Update lighting.dm

* Spelling correction (#3)

* Update layers.dm

* Update chunk.dm

* TO GO BYOND....

* Update lighting.dm
2018-03-08 22:43:23 -06:00
vuonojenmustaturska
8c87527005 Minor say code cleanup 2018-03-08 22:43:15 -06:00
vuonojenmustaturska
423302ac3c Merge pull request #36217 from Cruix/disease_freemove
Sentient diseases get 2 minutes to select their initial host
2018-03-08 22:42:57 -06:00
deathride58
0f0ab49648 Update species.dm 2018-03-08 01:03:56 -05:00
deathride58
56845788ac Merge pull request #5817 from Zna12/Filet-o-fish
Filet-O-Sharkpeople
2018-03-08 05:59:01 +00:00
deathride58
1850af961d Merge pull request #5852 from Citadel-Station-13/upstream-merge-36198
[MIRROR] Disease fixes
2018-03-08 05:58:11 +00:00
deathride58
f836affa2e Merge pull request #5842 from Citadel-Station-13/upstream-merge-36191
[MIRROR] Allow configuring ruin/empty space level count
2018-03-08 05:57:03 +00:00
Armhulen
e559fdca2c Mushroom people, revived! 2018-03-07 21:47:42 -06:00
vuonojenmustaturska
5cfc5f3730 Merge pull request #36198 from Cruix/disease_fixes
Disease fixes
2018-03-07 16:04:14 -06:00
Zna12
0941433022 Merge branch 'master' into Filet-o-fish 2018-03-07 10:41:09 -06:00
MMMiracles
48eac9e8c6 Thirteen Loko is actually dangerous (#36166)
* makes thirteen loko do the stuff it warns the person about

* you sceam in terror as you use the web editor!
2018-03-07 07:15:23 -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
013c908ebf Update robot.dm 2018-03-06 23:39:06 -06:00
Poojawa
57bd3824a4 fixes things and mentors. 2018-03-06 23:34:54 -06:00
Poojawa
3c1e557302 compile issues 2018-03-06 22:35:16 -06:00
Poojawa
455ee7e687 modules 2018-03-06 21:45:16 -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
CitadelStationBot
d95be2e261 [MIRROR] Allows admins to spawn mob-like objects for shenanigans (#5825)
* Allows admins to spawn mob-like objects for shenanigans (#36153)

This is basically extracting the functionality of the animation spell into an admin verb.

Please excuse the browser.dm code, this is more of a stepping stone towards the more complicated popup needed for custom ERTs.

cl Naksu
admin: Admins can now easily spawn mobs that look like objects. Googly eyes optional!
/cl

* Allows admins to spawn mob-like objects for shenanigans
2018-03-06 04:04:12 -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
Poojawa
0afe9eb7c3 All Maps now have Tesla as a primary engine (#5787)
* Converts all stations except Omega to Tesla Engines

* tweaks and meta fixes

* removes an exploit

* add some missing lights
2018-03-06 03:59:11 -06:00
Zna12
954ba91c07 Fucking furries reeeeeeeeeeeeeeeeee 2018-03-05 17:03:33 -06:00
CitadelStationBot
6c732407e8 [MIRROR] [s]Varedit exploit (#5824)
* Merge pull request #36180 from kevinz000/patch-459

[s]Varedit exploit

* [s]Varedit exploit
2018-03-05 16:55:19 -06:00
CitadelStationBot
558cf03062 [MIRROR] [s]Vvexploit (#5823)
* Merge pull request #36181 from kevinz000/patch-460

[s]Vvexploit

* [s]Vvexploit
2018-03-05 16:55:09 -06:00
Zna12
d7f3942129 Revert "Modularize modularize modularize"
This reverts commit 8a86cbd307.
2018-03-05 16:55:00 -06:00
Zna12
8a86cbd307 Modularize modularize modularize
Quaaaaaaaaack.
2018-03-05 16:52:25 -06:00
deathride58
b4e01ac82c Fixes widescreen pref regression (#5822) 2018-03-05 16:12:35 -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
766b85908e [MIRROR] Adds the Ancient Cloning Lab ruin (#5814)
* Adds the Ancient Cloning Lab ruin

* fixes conflicts
2018-03-05 15:20:49 -06:00
CitadelStationBot
3569152bf8 [MIRROR] Cleans up save file update code. (#5816)
* Cleans up save file update code.

* fixes merge issue
2018-03-05 14:44:18 -06:00
CitadelStationBot
848b12db64 [MIRROR] [READY]Hostile mobs can attack assemblies (#5821)
* [READY]Hostile mobs can attack assemblies (#36157)

* new fenotype

* attack

* Update items.dm

* Update assemblies.dm

* Update assemblies.dm

* Update items.dm

* [READY]Hostile mobs can attack assemblies
2018-03-05 14:38:30 -06:00
CitadelStationBot
c72201e605 [MIRROR] Splits projectiles into different files for readability (#5800)
* Splits projectiles into different files for readability

* Update tgstation.dme

* I love how the dme cleans itself up
2018-03-05 14:13:08 -06:00
CitadelStationBot
30a4705c01 [MIRROR] Clean up all sorts of crap, mostly defines (#5788)
* Clean up all sorts of crap, mostly defines

* fixes compile errors
2018-03-05 13:23:28 -06:00
CitadelStationBot
892b3b4307 [MIRROR] Allows the auxbase camera console to place airlocks on fans (#5813)
* Allows the auxbase camera console to place airlocks on fans (#35975)

* - Allows the aux base rcd to commit the same atrocities as the regular rcd
- Rids us of another value that does nothing

* first and only webeditor commit

* Allows the auxbase camera console to place airlocks on fans
2018-03-05 13:02:08 -06:00
CitadelStationBot
5374393635 [MIRROR] Removes the devils var (#5819)
* Merge pull request #36175 from tgstation/Cyberboss-patch-1

Removes the devils var

* Removes the devils var
2018-03-05 12:34:28 -06:00
CitadelStationBot
6134f79a26 [MIRROR] Converts several species traits into generic traits (#5710)
* Converts several species traits into generic traits

* Update traits.dm

* Update mousetrap.dm

* Update corporate.dm

* Update jellypeople.dm

* snowflake fix
2018-03-05 12:34:01 -06:00
Cameron!
841a4199af Removes MediHound's Noncon Vore (#5738)
* Removes MediHound's Noncon Vore

MediHound once again respects vore preferences, as intended.

To make up for this, they now receive a unique cyborg hypospray with fewer reagents, increased energy costs, and no ability to upgrade.

* Moves Preference Check to New Sleeper-Specific Variable, Buffs Hypo

Rather than using target.devourable, MediHounds now check for a new target.sleeperable preference, which defaults to TRUE.

Also, removed the custom HoundHypo. MediHounds will now get the full borg hypospray.

* Removes unnecessary 5th port code

* Breaks the patch for Bhijn's viewing pleasure

DNM etc

* Still not fixed

* Fixes it again.

MediHound sleeper preference is now a game preference toggle, rather than a vore panel toggle.

MediHounds will not be able to ingest SSD or catatonic players.
2018-03-05 12:33:23 -06:00
deathride58
318481e62d Merge pull request #5804 from Citadel-Station-13/upstream-merge-36095
[MIRROR] Makes blood rage more clear
2018-03-05 03:17:54 +00:00
deathride58
d720adf672 Merge pull request #5801 from Citadel-Station-13/upstream-merge-35895
[MIRROR] Fixes Guardian Spirits not being able to move in stopped time along with their user.
2018-03-05 03:16:48 +00:00