Commit Graph

19766 Commits

Author SHA1 Message Date
XDTM
6f5ddea836 Fixes slimes not being able to latch onto humans + faction tweak (#24759)
* tentadel

* back to normal

* Fixes slimes not being able to latch onto humans + faction tweak

* NO

* NO

* HUMANOIDS ONLY

* PUTTING THE PIG IN PIGGYBACK
2017-03-09 09:11:20 +01:00
Cyberboss
645f3b1d75 Cuts out a chunk of map loader time for maps with a lot of space (#24764)
* SPACE OPTIMIZATION

* Don't need this instancing anymore either

* Forgot to drop this

* FASTER!!!!

* FASTER!!!!!!!!!

* Move this back, it makes no difference

* Fix a potential bug

* FAAAAAAASSSSSSTTTTTTTTERRRRRR!!!!

* open

* Ye be warned

* Better diagnostics + fixes

* Fewer false positives

* Bleh

* Remove the unecessary z-expansions
2017-03-09 11:24:51 +13:00
Cyberboss
31ee152489 Repaths subsystem to controller/subsystem (#24624)
* Repaths subsystem to controller/subsystem

* Fix the shit
2017-03-08 22:05:45 +01:00
Cyberboss
4c4d2c28f9 Fixes 179 (#24807)
* Fixes 169

* What MSO said

* Fix

* Fite me travis
2017-03-08 21:59:59 +01:00
kevinz000
ceb65bd66b [READY]Chameleon gun projectile disguising (#24574)
* this'll end well

* hmm

* double hmm

* prevents emp crash

* why am i getting things wrong reee

* done

* .
2017-03-08 21:56:25 +01:00
oranges
8073a51b45 Merge pull request #24814 from Cyberboss/conveyorfix
Fixes conveyor switches
2017-03-09 09:46:01 +13:00
Joan Lung
ea99851a07 Clockcult stuff has colored lighting (#24678)
* Clockcult stuff has colored lighting

* fixsigils
2017-03-08 12:03:12 -06:00
Jordie
edf7b049b1 hi oranges how are you 2017-03-08 22:52:41 +11:00
Supermichael777
d1118c903c Adds canned air (#24783)
* adds canned air

* adds canned air

* air isnt cheap!

* Add files via upload

* oops

* Add files via upload
2017-03-08 02:56:24 -06:00
Cyberboss
fac0d69009 Fixes spam after admin event cancellation adds feedback (#24787)
* Fixes spam after admin event cancellation

* Add feedback
2017-03-08 02:42:42 -06:00
coiax
f88184937a Glowsticks (#24761)
* Ports glowsticks from Bay

* Adds glowstick sprites

* Glowsticks in party crates, maint and emergency toolboxes
2017-03-08 02:38:15 -06:00
Cheridan
d95377b800 Merge pull request #24773 from TrustyGun/pretty_lights
Laser beams have appropriately colored lights
2017-03-08 02:32:39 -06:00
Cheridan
deb4c2cde3 Merge pull request #24743 from ChangelingRain/glowshrooms
Glowshrooms now have colored light, tweaks glowshroom/glowberry lighting range
2017-03-08 02:30:46 -06:00
Cheridan
d6905ed54e Merge pull request #24774 from ChangelingRain/computerlight
Adds light colors for a few more computers
2017-03-08 02:26:37 -06:00
Cheridan
7026d45b9e Merge pull request #24780 from ChangelingRain/basaltfix
Fixes basalt lighting
2017-03-08 02:25:38 -06:00
Cyberboss
7ed1ae0ce0 Derp 2017-03-07 21:11:34 -05:00
Cyberboss
93bb425e2c Fixes conveyor switches 2017-03-07 21:04:49 -05:00
coiax
2d288690e1 New Librarian traitor item: Haunted Magic Eightball (#24607)
* New Chaplain traitor item: Haunted Magic Eightball

🆑 coiax
add: Toy magic eightballs can now be found around the station in
maintenance and arcade machines. Ask your question aloud, and then
shake for guidance.
add: Adds new Chaplain traitor item, the Haunted Magic Eightball.
Although identical in appearence to the harmless toys, this occult
device reaches into the spirit world to find its answers. Be warned,
that spirits are often capricious or just little assholes.
/🆑

* Compiles, fixes the bugs

* Adds toy eightballs to loot, toys; adds haunted to uplink

* Every 3 minutes

* Noiseless, random haunt, limited stock

* Added sprites for eightball

* Removed notice to replace sprites

* Librarian only
2017-03-08 12:14:44 +13:00
coiax
311ea1c7f1 New wizard spell: The Traps (#24571)
* New wizard spell: The Traps

🆑 coiax
add: Wizards now have a new spell "The Traps" in their spellbook.
Summon an array of temporary and permament hazards for your foes, but
don't fall into your own trap(s).
/🆑

Conjures some traps in an aoe, traps include Hand of God traps and
swarmer shocking traps. Hand of God traps require 60 seconds to recharge
between trapping.

I saw Cobby give this as a TC trade, and I thought it seems reasonable
as a silly wizard spell.

* Added The Traps to spellbook, modifed trap code more

* Adds action icon for The Traps

* Need to be adjacent to disarm

* Invocation is now Latin for "BEWARE THE TRAPS"
2017-03-08 12:13:03 +13:00
Cyberboss
8552c09133 Forensic scanners can now scan storage objs (#24672)
* Fix a spawn

* Use pre_attackby

* Fix this other spawn
2017-03-08 12:04:02 +13:00
coiax
7775607a26 Improved supermatter headaches and voice (#24649)
* Improved supermatter headaches and voice

🆑 coiax
add: You only have a headache looking at the supermatter if you're a
human without mesons.
add: The supermatter now speaks in a robotic fashion.
/🆑

* Hallucination range is a macro
2017-03-08 12:03:14 +13:00
Jordie
dc39267b50 Merge pull request #24592 from KorPhaeron/catgirlbuff
Mutant parts are removed if you roll a head job, as opposed to being barred from these jobs
2017-03-08 09:58:55 +11:00
Cyberboss
0f554741f0 Fixes some stuff with paper planes (#24729)
* Fixes some stuff with paper planes

* Renames a misspelled argument
2017-03-08 09:39:56 +13:00
Cheridan
d38b3aa7ce Merge pull request #24633 from LanCartwright/buckshotnerf02032017
Adds negative damage scaling to Buckshot.
2017-03-07 14:38:40 -06:00
oranges
904472d93c Merge pull request #24718 from coiax/hologram-secondary
Demotes HOLOGRAM to secondary flag
2017-03-08 09:25:21 +13:00
oranges
12e6d6c64c Merge pull request #24650 from coiax/admin-renaming-tools
Admins have more tools for renaming the station
2017-03-08 09:23:36 +13:00
bgobandit
a3c4a7d5a6 Reject ahelp and IC issues have a short cooldown (#24663)
* Reject Adminhelp and IC Issue buttons have a cooldown.

* placates the lzimann cat
2017-03-08 09:18:59 +13:00
oranges
5ec0b2e072 Merge pull request #24725 from Xhuis/soapstone_cleanup
Cleans up soapstone code
2017-03-08 09:11:37 +13:00
oranges
6a2cacc767 Merge pull request #24745 from Cyberboss/patch-19
Fix a hallucination runtime
2017-03-08 09:11:04 +13:00
Cyberboss
e03144dc1d Smoother roundstart take II (#24504)
* Revert "Until I figure out why random keys aren't being transferred"

* Fixes cyborgs not getting their key at roundstart

* Fixes mimes not getting the prefs name

* Fixes clowns not getting prefs names

* Sets the round start timer when it actually starts

* Remove fluff CHECK_TICKs

* Moves siliconization to the jobs module

* Yeah whatever

* Fixes AIization

* HNNNNGHHHH WHY IS THIS UP HERE?

* Fix cyborgs not linking to AI
2017-03-07 21:06:33 +01:00
Robustin
5ff8844ded DNA Vault is a little more obtainable, new powers (#24625)
* Vault Update

* Vault Pack Includes Probes

* Robustin code

* I need sleep

* Fast Attack Power

* Yea I really need sleep
2017-03-07 11:52:13 +01:00
Jordie
63b3699cdd MySQL Execute error handling (#24738)
* wip commit

* mysql execute proc now handles errors itself

* adds log_sql()

* implements log_sql()
2017-03-07 10:55:42 +01:00
Supermichael777
f7a38c2113 Adds a Chameleon belt (#24569)
* adds a mildly evil belt

* adds the belt to a kit that sorely needed it
2017-03-07 09:10:36 +01:00
Joan Lung
6f732b42ad no message 2017-03-06 21:56:27 -05:00
Joan Lung
228d35d4ab Adds light colors for a few more computers 2017-03-06 21:18:38 -05:00
Joan Lung
a73cb2cfce Not Bioluminescence 2017-03-06 20:41:36 -05:00
Joan Lung
08cc485e98 glowy shit 2017-03-06 20:35:57 -05:00
TrustyGun
3008d4b9a7 cool 2017-03-06 20:21:17 -05:00
oranges
9e8c2d004c Merge pull request #24762 from Cyberboss/IWillMurderTheNextPersonToDefineNew
Fixes lighting runtimes
2017-03-07 13:15:58 +13:00
Cyberboss
f21c65cb95 Fixes lighting runtimes 2017-03-06 18:58:36 -05:00
kevinz000
7cb0ca9a92 Update flightsuit.dm (#24681) 2017-03-06 16:28:15 -06:00
PKPenguin321
aa8bbe6e39 more consoles make appropriately colored light now (#24688)
* requests consoles make green light now

* hex

* i forgot hex needs ""

* cargo consoles are orange

* stock exchange green
2017-03-06 16:27:15 -06:00
Cyberboss
1bbc640afe Runtime Dynamic Station Loading (#24171)
* Dynamic map loading prototype

* Get the title screen working

* Fixes the random pod bugs

* map configs

* Add back the asteroid

* Ignore the rotate file

* Fix some shit

* More shit fixes

* Babby's first json

* Cyberboss confirmed shitcoder

* Makes map rotation great again

* Moves the map defines

* Delete tgstation2.dm

* Convert runtimestation

* Convert PubbyStation

* Convert OmegaStation

* Convert Metastation

* Convert Delta Station

* Lol file extensions

* Reee line endings

* Take out the trash

* Fix loadallmaps.dm

* Deltaassssssstation?

* Fix travis

* Did I ASK you to change the line endings?

* Remove votable maps

* Cleanup

* Previous config. Load configs in New. Fix splash

* Fix this

* More generic minetype

* STOP TOUCHING THE LINE ENDINGS!!!

* Add some flexibility to /obj/screen/splash

* Fix the shit

* Update gitignore

* Smooth transition from last map

* Better check

* Missed this map rotate check

* Remove these checks too

* Prep for a future request by @kevinz000

* Fix z2 line endings

* Solution for custom .dms

* Rename some things, trim some fat

* Fixes default map_config

* Remove stale comment

* Delete the previous config after loading

* Don't try to open a non-existent file

* Delete the old rotator script

* And references to it

* Line endings

* More line endings

* Del checks from when m-config may have not existed

* LINE ENDINGS

* Update the default map config

* Map load error checking for what it's worth

* Small cleanup

* For case sensitive

* File systems

* Strip maprotate stuff from build script

* Spruce up the _maps tree. Compile some empty space

* Make travis simpler

* LINEARU ENDARU!!!

* tgstation TWO!!!

* Lowercase mine type

* Dummy dm's for testmerging

* Fixes job ordering

* If ghosts wanna watch the map load so be it

* Let them know what's going on

* Fixes z-transitions

* Optimize z expansion further

* Remove this old var

* Fix wiznerd teleportation

* Rmove butt

* Does the thing

* Moved temp configs to the data dir

* Un-touch gitignore

* Forgot templates.dm

* Forgot to include the includer

* Fair enough

* SILENCE IMBECILE!

* @Cyberboss still a fuckboi

* Speed things up a bit

* Fix a potential bug with the error message

* Whatever
2017-03-07 10:45:31 +13:00
Cheridan
63c33469df Merge pull request #24711 from Cyberboss/patch-13
Fixes lighting SS init lag
2017-03-06 15:39:12 -06:00
Kyle Spier-Swenson
887d2356d7 Quick fix for vg light memleak. 2017-03-06 13:20:25 -08:00
Cheridan
50b66e5c59 Merge pull request #24668 from Cyberboss/AdminCancel
Allows admins to cancel random events
2017-03-06 15:18:33 -06:00
Cyberboss
fc1c63558d Fix a hallucination runtime 2017-03-06 14:04:33 -05:00
Joan Lung
10100f1d9f Glowshrooms now have colored light 2017-03-06 13:19:40 -05:00
Cyberboss
4ed57234b7 Ports some low level New()s to Initialize (#24211)
* Revert "Revert "Ports some low level New()s to Initialize""

* Fixes #24202

* Fixes #24197

* If ever it were to exist, it belongs here
2017-03-06 19:19:14 +01:00
Xhuis
86488d18d3 Fixes some issues and closes others; nerfs abductor emergency teleporter (#24690)
* Fixes Wish Granter resurrection spam

* Fixes box icons

* Emergency teleporter nerf
2017-03-06 12:20:55 +01:00