Commit Graph

14559 Commits

Author SHA1 Message Date
Poojawa 8a64466051 github pls. 2018-03-07 00:16:32 -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 6b6a08d332 last of the port 2018-03-06 21:51:37 -06:00
Poojawa c526f3ec26 skin.dmf 2018-03-06 21:48:05 -06:00
Poojawa 71d1174548 Merge remote-tracking branch 'refs/remotes/origin/master' into sync 2018-03-06 21:47:22 -06:00
Poojawa 786ddc4694 icons 2018-03-06 21:46:57 -06:00
Poojawa 455ee7e687 modules 2018-03-06 21:45:16 -06:00
Poojawa 95cb6b23f2 controllers, datums, game 2018-03-06 21:16:46 -06:00
Poojawa fcc038c41a defines, helpers, globalvars 2018-03-06 21:05:15 -06:00
CitadelStationBot 4d0b7133c8 Automatic changelog generation for PR #5828 [ci skip] 2018-03-06 17:40:52 -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 a1416622d2 Automatic changelog generation for PR #5806 [ci skip] 2018-03-06 12:28:25 -06:00
CitadelStationBot 534c4fcc18 [MIRROR] Space Parallax Tweak (#5806)
* Space Parallax Tweak (#36137)

* Tweaked contrasts

Upped the contrast on layer 1.
Tweaked the saturation to layer 2.

* more saturation and contrast

* tweak

* .

* Revert "."

This reverts commit 9590c657bac2c3afed007c82a7d05d36fd4249a6.

* Revert "Revert ".""

This reverts commit 6b9adf4d3fc13d6d3d934cc3eb9ea464c432c414.

* polish

* DO YOU SEE?

* Space Parallax Tweak
2018-03-06 12:28:22 -06:00
CitadelStationBot 33b87cedbe Automatic changelog generation for PR #5803 [ci skip] 2018-03-06 07:08:19 -06:00
CitadelStationBot 9a2ea0eb69 [MIRROR] Pubbystation: tweaks and fixes round two (#5803)
* Pubbystation: tweaks and fixes round two

* pubby fixes
2018-03-06 07:08:16 -06:00
Poojawa a2f1727b4e ignore admin.txt locally 2018-03-06 05:49:05 -06:00
CitadelStationBot 846f792ac1 Automatic changelog generation for PR #5825 [ci skip] 2018-03-06 04:04:15 -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
CitadelStationBot 811b188742 Automatic changelog generation for PR #5789 [ci skip] 2018-03-06 03:59:33 -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 9d8286ee53 Automatic changelog generation for PR #5787 [ci skip] 2018-03-06 03:59:13 -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
CitadelStationBot 2c618b7fc5 Automatic changelog generation for PR #5722 [ci skip] 2018-03-06 03:56:22 -06:00
Poojawa 54e33374d2 Hypospray MK IIs (#5722)
* Initial commit

* most of the work down

itfinallycompiled

* tweaks

* ree

* fixes bad attempt at mode switching

* slight sprite tweak to give vials better clickability.

* can I has real review now pls thx Bhijn

* pre-emptively avoiding a troll 'review'

* WEH

* trying to code new functions is dumb

* reeeeee

put_in_hand doesn't exist apparently

and the shitty thing wants me to select mobs, not modes?

* ya lemmie just, rewrite everything

* fixes adaptation issues and sprites. Loading/unloading works

Now just to figure out reagent transfer_to code. aaaaaaaaaAAAAAAAAAAAAAAAAAAAAAAA

* HAHAHA YES

* Fully working with sounds and all.

* remove a testy boi
2018-03-06 03:56:19 -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
CitadelStationBot b60e432c79 Automatic changelog generation for PR #5822 [ci skip] 2018-03-05 16:12:38 -06:00
deathride58 b4e01ac82c Fixes widescreen pref regression (#5822) 2018-03-05 16:12:35 -06:00
CitadelStationBot b663cc7381 Automatic changelog generation for PR #5815 [ci skip] 2018-03-05 15:21:02 -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 032511a03e [MIRROR] Added a cooldown to being shown hud images (#5810)
* Merge pull request #36144 from Cruix/hud_images_cd

Added a cooldown to being shown hud images

* Added a cooldown to being shown hud images
2018-03-05 15:02:10 -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 f746366c36 Automatic changelog generation for PR #5821 [ci skip] 2018-03-05 14:38:32 -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
Poojawa 6a688f2588 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2018-03-05 13:25:04 -06:00
Poojawa 214e008e3d cleans out AutoChangeLogs, good christ 2018-03-05 13:25:01 -06:00
CitadelStationBot df11e970f7 Automatic changelog generation for PR #5788 [ci skip] 2018-03-05 13:23:30 -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 c6aab4b38b Automatic changelog generation for PR #5813 [ci skip] 2018-03-05 13:02:10 -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 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 506337a0cf Automatic changelog generation for PR #5808 [ci skip] 2018-03-05 13:01:21 -06:00
CitadelStationBot 2a161f4727 [MIRROR] Fix brains in MMIs being unable to pilot mechs (#5808)
* Merge pull request #36128 from AutomaticFrenzy/patch/brainmech

Fix brains in MMIs being unable to pilot mechs

* Fix brains in MMIs being unable to pilot mechs
2018-03-05 13:01:18 -06:00
CitadelStationBot fe37e351bc [MIRROR] Updates RuntimeStation to make testing faster (#5807)
* Merge pull request #36120 from XDTM/RuntimeFuntime

Updates RuntimeStation to make testing faster

* Updates RuntimeStation to make testing faster
2018-03-05 13:00:50 -06:00
CitadelStationBot 6deeaab1f9 Automatic changelog generation for PR #5792 [ci skip] 2018-03-05 12:37:43 -06:00
CitadelStationBot de97c9653a [MIRROR] SOMETHING'S WRONG, I HOLD MY HEAD, BILLY HERRINGTON IS FUCKING DEAD (#5792)
* SOMETHING'S WRONG, I HOLD MY HEAD, BILLY HERRINGTON IS FUCKING DEAD

* Update fitness.dm

* fixes compile issue
2018-03-05 12:37:40 -06:00