Commit Graph

40933 Commits

Author SHA1 Message Date
Jordan Brown 9a34619e09 Fixes the last Href Token issues (#31666) 2017-10-14 12:45:40 -04:00
ShizCalev 6e0e047fb2 Even more explosive stuff... 2017-10-14 11:02:24 -04:00
Leo 91e88d4ce8 Merge pull request #31670 from tgstation/Cyberboss-patch-3
IC Issue also tells the ahelper that their ticket has been resolved
2017-10-14 11:05:43 -03:00
Leo 8fef0dd280 Merge pull request #31668 from tgstation/Cyberboss-patch-2
Fixes slapping while restrained/etc...
2017-10-14 11:05:02 -03:00
jughu bac0576345 Update weaponry.dm 2017-10-14 11:34:32 +02:00
duncathan eb27eac45f prevents floor tiles from being placed over mobs buckled at level == 1 2017-10-14 02:13:01 -06:00
duncathan 1fd5120544 fixes freon uncolouring 2017-10-14 00:07:22 -06:00
AnturK f9fb3084ef Removes unused list (#31662) 2017-10-14 00:49:29 -05:00
oranges 44017436f0 Merge pull request #31693 from Armhulen/patch-12
FIXES the NOT FIXED donk pocket issue by FIXING in some omnizine on grind
2017-10-14 17:49:50 +13:00
oranges e03d2f5cf7 Merge pull request #31655 from duncathan/atmos-patch1
Slight change to the behavior of Assimilate_Air()
2017-10-14 17:49:18 +13:00
Armhulen edd66e1320 New Chaplain Weapon: Hammer of Pride! (#31454)
* cool beans

* i think this works

* i'm only human after all

don't put the blame on me

* is this what you wanted??

* ya

* K
2017-10-14 17:44:31 +13:00
Armhulen 1673ed22ad OK THERE
FUCK MAN
2017-10-13 19:30:31 -07:00
duncathan 2658df3fa0 allows vent internal pressure bound to be set by air alarms 2017-10-13 20:12:44 -06:00
duncathan 074e7eaeae fixes filter NaN issue 2017-10-13 18:12:44 -06:00
kevinz000 8d647ff524 Flying mobs now clip past non flying mobs, various flightsuit/iontrail/movement tweaks/code improvements/bugfixes (#30570)
* this will end horribly

* s

* kek

* wew

* i dont know what an atomized pr is

* lets hope this doesnt blow up

* ok

* Update living.dm

* Update flightsuit.dm

* Update living.dm

* Update living.dm
2017-10-13 18:09:20 -06:00
ShizCalev a533196c71 Invisible wirecutters and made screwdrivers hivis (#31649) 2017-10-13 17:34:40 -06:00
AlecW 7982ceddb2 Adds Toggle Underline button to PDA menu (#31604)
* Add Toggle Underline button to PDA.dm

-Adds Toggle Underline button to PDA menu that, when pressed, applies underline styling to all <a> elements.

* Changed 1/0 to bools

Now using TRUE and FALSE, also cleaned some HTML I missed the first time
2017-10-13 15:51:17 -06:00
Robustin c353b77f4e Smoke Machine Updates & Fixes (#31598)
* Smoke Machine Update

* Update smoke_machine.dm

* Compiling again
2017-10-13 15:49:24 -06:00
WJohn bc4b809b9a Replaces boxstation white ship with metastation's white ship. (#31571)
* Replaces boxstation white ship with metastation's white ship. Gives metastation white ship some weak laser turrets so it has slight protection against space carp.

* TGM meta shuttle template

* Does what shiz asked, probably.

* More fixes for shiz
2017-10-13 15:48:22 -06:00
vuonojenmustaturska 673abab94e Small lighting perf tweak (#31635)
* lightshit

* Revert "lightshit"

This reverts commit 25a1b6e4a104546c6393d3c472c0412f7580fe96.

* bfghsfg

* kreegah

* honk
2017-10-13 15:29:50 -06:00
ShizCalev 65bf8e5985 Cleans up explosives at syndie base ruin (#31645) 2017-10-13 15:28:42 -06:00
MoreRobustThanYou 77b3956c1b You can now drag-drop people into open DNA scanners (#31646) 2017-10-13 15:27:35 -06:00
MoreRobustThanYou d6dbe3adaa Medibots will no longer inject people in lockers/sleepers/etc (#31648) 2017-10-13 15:25:54 -06:00
kingofkosmos c3d20c6d8e Adds few comments so other people won't be as confused as I was.
Adds examine-messages for alt-clicking.
Added sounds for all the computers when inserting/ejecting IDs.
2017-10-13 23:18:14 +03:00
ninjanomnom bfed923e43 Repopulates SSshuttle recover 2017-10-13 15:47:33 -04:00
francinum 7ba6711174 Fixes various Nanotrasen capitalizations (#31620)
* Fixes capitalization of Nanotrasen for secsuits

gimme the GBP

* Fixes this one too
2017-10-13 12:12:56 -05:00
ShizCalev d927f90eab Various grammar fixes 2017-10-13 11:55:54 -05:00
militaires b052ebab21 Fixes Shambrero Penguin names 2017-10-13 11:55:27 -05:00
militaires bb08fac0db Revert "Fixes shambrero penguin's name"
This reverts commit 59376543da685167c14eb683342bda2edb8b8eeb.
2017-10-13 11:55:27 -05:00
militaires fdb002da06 Fixes shambrero penguin's name 2017-10-13 11:55:27 -05:00
kingofkosmos efcd9131ba Alt-clicking a computer now ejects the ID if there is one inside.
Also makes the computer screen refresh when you insert an ID.
2017-10-13 17:50:52 +03:00
Jordan Brown 701266fa7b IC Issue also tells the ahelper that their ticket has been resolved 2017-10-13 10:49:06 -04:00
nicbn 0fa8587f83 Bullet decals tweak (#31420)
* wee

* screen clock update

* resist and stop pulling

* Whoop, Joan messed up on the selection border so here's some fixed icons for that

* there we go

* Update walls.dm

* Update walls.dm

* Update walls.dm
2017-10-13 10:46:45 -04:00
Jordan Brown 963fc6b4ae Merge branch 'master' into patch/thethe 2017-10-13 10:23:55 -04:00
Emmett Gaines 456cd10d94 Radiation rework and subsystem (#30909)
* radiation rework and subsystem

* moves a few things to initialize and adds radiation insulation

* adds a radiation contamination mechanic and makes requested changes

I'm terrified by the possibilities from this

* radiated objects give off light

and hopefuly contamination is balanced

* fixes runtimes and an mc crash kek

removed the lighting part of contaminated objects
attempted some more balancing

* Collectors output power in process() gradualy

And some more balancing tweaks

* Excludes a bunch of things from becoming radioactive

* Ready for testmerge balancing

* Inverse square law was swapped

* testmerge balancing

fixes the geiger counter
buffs collector power gen
nerfs sm radiation
slightly buffs rad insulation
nerfs rad damage (and its burn)
raised the minimum radiation

* disabling the radiation subsystem won't build up rad wave datums forever

* rewrites how mobs handle radiation

upgrades geiger counter functionality
and more balance tweaks

* cleans up stuff and removes debug message

* Slight contamination buff

* Major rad wave performance boost

Also improves rad insulation
Buffs contamination, again

* Fixes insulation runtime

More balance and performance tweaks

* fixes rad collectors not receiving power

* The final balance commit

Fixes a major bug causing radiation to underperform
More geiger counter changes that will be changed more to add sounds

* Monkey business

* Geiger counter sounds

* cleanup and move components to their own initialize

* Some code cleanup

And forgotten changes

* Cleans up some trailing returns

* Mapping changes
2017-10-13 10:22:00 -04:00
kevinz000 c073486645 Fixes explosion particles causing a massive amount of runtimes (#31608) 2017-10-13 10:14:42 -04:00
kevinz000 2d229eecb4 Fixes preferences generation (#31607) 2017-10-13 10:14:22 -04:00
Jordan Brown a4ac68400a Merge pull request #31602 from AnturK/tunnels
Fixes diagonal tunnels
2017-10-13 10:13:57 -04:00
Jordan Brown d138a81bd4 Merge pull request #31614 from AnturK/zap
Fixes electrocution animation
2017-10-13 10:13:24 -04:00
Jordan Brown 4a1a84b5b2 Fixes slapping while restrained/etc... 2017-10-13 10:11:02 -04:00
ninjanomnom 9495e01ea1 Fixes custom shuttle docker display 2017-10-13 02:26:37 -04:00
duncathan 26e1a8c527 changes Assimilate_Air() behavior when there are no atmos_adjacent_turfs 2017-10-12 21:14:35 -06:00
Armhulen 882e561f8c Adds a fireball from the heavens as an admin smite (#31502)
* really gamers?

* yeah yeah YEAH

* cucked again!

* it works

* I SAID IT WORKS
2017-10-12 21:37:11 -04:00
Jordan Brown 40ffeff63c Merge pull request #31643 from duncathan/letsallsitdownbythefireplaceandwarmup
Activates global warming
2017-10-12 21:03:29 -04:00
Ashe Higgs 389db5e7f6 Stargazers are now station-restricted, and cogged APCs are now quiet (#31565)
* Clockwork power generator tweaks

* Includes a blob_allowed check
2017-10-12 17:32:08 -06:00
MoreRobustThanYou 99f8c92fc0 Adds sports bras (#31590)
* uguuu~

* Update sprite_accessories.dm

* Update sprite_accessories.dm

* make them an undershirt
2017-10-12 19:08:10 -04:00
duncathan 7ffea9285d who turned off the pilot light in the boiler room? no wonder it was cold 2017-10-12 16:18:38 -06:00
Jordan Brown bde243266b Merge pull request #31588 from ninjanomnom/shuttle-parallax
Fixes stationary mob parallax
2017-10-12 17:06:05 -04:00
oranges e4a63bbda0 Merge pull request #31631 from tgstation/Cyberboss-patch-2
Use legacy topic keywords lookup method
2017-10-13 10:05:43 +13:00
Jordan Brown 647237f32f Merge pull request #31582 from feemjmeem/smoke-log-announcing
Notify admins when someone activates a smoke machine
2017-10-12 17:03:15 -04:00