Commit Graph

7166 Commits

Author SHA1 Message Date
CollenN 2aab5fa71c Finalizes Mutantrace Datum Update
https://github.com/tgstation/-tg-station/pull/3609

Squashes the commits from the above pull request. Should hopefully be a
lot less cluttered.
2014-06-19 17:42:14 -04:00
Robson Richards 96354bb56d Lockers now take 40 ticks to weld + Sounds + Feedback messages
Minor reformat of code for Locker welding
2014-06-19 16:13:10 +01:00
Alex 2dc79a7bbe Merge pull request #3836 from phil235/TachyonDetectorFix
Fix Tachyon detector and TTV not being deleted if exploding inside something
2014-06-19 11:01:14 +01:00
Alex 6d80b17745 Merge pull request #3886 from Cheridan/burnitall
Burnables
2014-06-19 11:00:04 +01:00
Kelenius cd4be00d3b Fix 2014-06-19 02:48:37 +04:00
Kelenius a8b7588c12 Merge branch 'master' of https://github.com/tgstation/-tg-station into Temp
Conflicts:
	code/game/objects/items/weapons/grenades/ghettobomb.dm
	code/game/objects/structures/door_assembly.dm
2014-06-19 02:27:10 +04:00
phil235 caef47f075 removing the commented part 2014-06-18 20:59:03 +02:00
Alex a3a0ede3a0 Merge pull request #3922 from phil235/BlindHealthScanFix
Scanners messages fix
2014-06-16 10:43:50 +01:00
Alex 8171c40300 Merge pull request #3915 from phil235/AirlockAssemblyF
Fix for #3871
2014-06-16 10:38:12 +01:00
Alex 02d4a5a0d2 Merge pull request #3904 from Cheridan/sillynarnar
Nar-Sie update
2014-06-16 10:37:35 +01:00
ikarrus bf5200daf8 [Config] Security Officer Scaling
Intended for high-population servers

Open security officer positions scale with population, between 5 slots at ~40 players to 12 slots at ~96 players

Default coefficient is 8, but may be modified (or disabled) in the config.

Extra lockers will spawn if there aren't enough lockers.
2014-06-15 21:24:07 -06:00
Cheridan 352d5a5627 MONKEY MODE REDUX
AHUAHEUAHUHEGUEHGAUHEGUAEH

monkeys will now possibly transfer all diseases on bite because that's how diseases kinda work
2014-06-14 21:30:25 -05:00
phil235 c84f26a96d Scanners messages fix 2014-06-13 22:36:36 +02:00
phil235 6d1bfb9244 removing !src checks 2014-06-13 19:38:15 +02:00
MrPerson c43518351f Some fixes and minor improvements to examining. 2014-06-13 09:01:52 -07:00
ikarrus df285ff7b3 Resolved conflicts:
code/modules/mob/mob.dm
2014-06-13 09:04:30 -06:00
Alex 0aa1b9cae1 Merge pull request #3907 from Ikarrus/nosearchstrip
Non-carbon mobs can no longer search storage items
2014-06-13 09:16:59 +01:00
phil235 2f03f0fabd Door Assembly exploit fix 2014-06-12 23:06:42 +02:00
Kelenius 698fde12f4 Two small bugs... 2014-06-13 01:01:10 +04:00
ikarrus f00c623514 Reverted stripping restrictions 2014-06-12 09:29:45 -06:00
Alex 9c6ac5c5f7 Merge pull request #3818 from phil235/ChameleonMimeFix
FIx issue #3692
2014-06-12 10:34:41 +01:00
ikarrus a8432993c0 Cyborgs can no longer strip people or search storage items
-Secborgs can still use their handcuff module to uncuff people
2014-06-11 21:50:41 -06:00
Malkevin 4cd64a51d1 Changed the weighting on blast range, 4 turns out to be quite big so shouldn't happen too often 2014-06-12 01:09:58 +01:00
Cheridan b80e9eda57 Nar-Sie update 2014-06-11 14:19:58 -05:00
Malkevin 5da7210e97 Changed the IEDs name and desc to firebombs
Changed changelog entry per request
2014-06-11 19:30:52 +01:00
Malkevin 01a7c23b94 Merge branch 'master' of https://github.com/tgstation/-tg-station into iracocktail 2014-06-11 19:06:44 +01:00
Alex 54ac7f0914 Merge pull request #3873 from Ikarrus/boxpolishjune2014
Map Update 8/6/14
2014-06-11 12:15:36 +01:00
Alex 4c627b956c Merge pull request #3760 from Ikarrus/bomblogging
Improved bomb logging for admins
2014-06-11 11:42:16 +01:00
Alex fda9885e61 Merge pull request #3820 from Ikarrus/nukechecker
Removes hacky code in favour of a process() check for the nuke disk
2014-06-11 11:40:56 +01:00
Kelenius ce98f5a82b Some grammar 2014-06-11 11:04:00 +04:00
Kelenius 3908160998 One big update for stacks. 2014-06-10 20:36:08 +04:00
Cheridan 4facf4aa47 Update cigs_lighters.dm
burnt matches get weak again
2014-06-09 21:30:57 -05:00
Cheridan ea7ab93e21 Update boxes.dm
Removes necessary check from matchbox attackby.
2014-06-09 20:00:38 -05:00
Cheridan b5b5735631 Refactoring of match code, makes it a little neater
Refactoring of rolling paper packs to a storage item.

Improves Rolling Paper and Packs sprites.
Cigarettes/Matches can be lit by fires now.
2014-06-09 19:56:25 -05:00
MrPerson 59d64656c4 Some fixes and minor improvements to examining. 2014-06-09 11:35:29 -07:00
MrPerson 645ca7f8a1 Merge branch 'master' of https://github.com/tgstation/-tg-station into examinate_the_doctor
Conflicts:
	code/_onclick/click.dm
	code/game/atoms.dm
	code/game/objects/items/toys.dm
	code/modules/paperwork/folders.dm
	code/modules/power/cable.dm
2014-06-09 01:50:44 -07:00
ikarrus 98abad6481 Map Update 8/6/14
-Added windows to garden and Syndicate base
-Renamed brig lockdown button to something more appropriate
-Added subtle outlines for shuttle docking areas
-Moved the HoP line flasher back to make it harder to steal the flash inside during the initial rush
-Added teleporter beacon to the old AI sat teleporter
-Moved prison newscaster
-Made N2O storage more visible for security
-Removed extraneous light in the execution room
-Added Quarantine to AI upload
-Captain now spawns with a box of spare silver IDs instead of regular ones
-A few minor piping/wiring improvements
2014-06-08 19:26:37 -06:00
Malkevin b4ee133336 spaces 2014-06-08 01:00:51 +01:00
Malkevin 67fdbfbaaf Funfact: pickweight doesn't like numbers unless they're in a string. 2014-06-07 21:42:27 +01:00
Malkevin 6aa15e7337 Changed IEDs into firebombs.
Changed IEDs into firebombs to curtail the amount of station damage done whilst keeping IEDs useful and still keeping fuel tank bombs a useful saboteur's tool.

Their fuse time is a bit more variable too, including a 1 in 10 chance of them going off practically straight away (note: this is counter-able by the user wearing a fire-suit, git gud and l2p)
2014-06-07 03:18:21 +01:00
Rockdtben 569d12facf Moved item_heal_robotic out of obj/item and into mob_helpers.dm 2014-06-05 19:25:08 -05:00
Alex d0db8fdbed Merge pull request #3832 from phil235/StunprodFix
Stunprod Fix
2014-06-05 21:40:45 +01:00
ikarrus b1f050e63a Adding fingerprints to actions:
-breaking windoors
-wrenching/unwrenching pipe dispensers
-locking/unlocking crates
-breaking grilles
-smashing windows
-deconning walls
2014-06-04 22:30:46 -06:00
ikarrus 40800b79e0 The Loggening: Admin Edition
-Build mode logging. A lot of its functions are highly abusable but not logged
-Gravity Catapults no longer spam asay. They will be kept in the game log.
-Logging for Cyborg handcuffs
-Logging for Stripping/equipping
-Logging for decreasing PA power control. Easier as an admin to tell when I should panic without having to watch them like a hawk.
-Logging for disposaling people
-Some code optimizations along the way as well
2014-06-02 23:13:33 -06:00
Cheridan b3a1426791 Merge pull request #3825 from inorix/borg-name-numbers-fix
Fixes borg naming rejecting numbers in name
2014-06-02 15:40:21 -05:00
phil235 dca72dc916 Fix Tachyon detector and TTV not being deleted if inside something 2014-06-02 20:25:06 +02:00
phil235 40fbe585ba Warning message replaced by sparks sound 2014-06-02 01:42:50 +02:00
phil235 2be11ab55e Fix 2014-06-02 01:01:16 +02:00
phil235 8c6cd7b28f Stunprod Fix
* Fix icon not updating when turning off baton/stunprod with a total cell charge below the hitcost.
* Baton/stunprod no longer accepts cell with capacity below the hitcost(charge used per stun).
* Removes being able to give one last hit (that doesn't even deduct any charge) when the cell charge gets below the hitcost.
* Adds warning message when baton/stunprod turns off from being out of charge.
2014-06-02 00:42:23 +02:00
Miauw62 44f769208c Merge pull request #3804 from Cheridan/roboShlock
Fixes Robocop board not working
2014-06-01 12:16:16 +02:00