coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
19,874 Commits 9 Branches 11 Tags
8b2175b5e9736acbadb94deff4ac27ca6870ba02
Commit Graph

4880 Commits

Author SHA1 Message Date
CollenN 734558f7cc Removes reagent check 
I've been somewhat busy recently.
 2014-06-30 17:01:29 -04:00
Aranclanos c65aa2b5a4 Merge pull request #4000 from Cheridan/terribleidea 
MONKEY MODE REDUX
 2014-06-30 16:27:22 -03:00
Cheridan 854d6452f6 Merge pull request #3978 from LandoTheClimber/lockboxpda 
Allows PDA's to unlock lockboxes.
 2014-06-25 11:56:00 -05:00
LandoTheClimber c6bd1174b1 Switched it to use GetID() proc 2014-06-23 07:45:45 -04:00
MrPerson 1494b8062f Makes the spare PDA box on the bridge not invisible 2014-06-22 16:21:42 -07:00
LandoTheClimber 756b317e4e Allows PDA's to unlock lockboxes. 2014-06-22 16:04:59 -04:00
CollenN 36261f94c8 return 1 2014-06-21 15:40:16 -04:00
CollenN 5913913c45 Fixes scan message 
Now it uses the right color and punctuation
 2014-06-21 15:26:16 -04:00
CollenN c2dacb8d1f Balancing 
Tweaks the cooldown numbers, as well as the wavelength calculations.

Anti-toxin, hyronalin, and arithrazine all reduce the effects of the
radiation now.
 2014-06-21 14:30:49 -04:00
Cheridan 39fb126171 Merge pull request #3963 from Miauw62/itsnotmyfault 
Removes custom law board confusion
 2014-06-21 01:08:49 -05:00
Cheridan f786a6c2c0 Merge pull request #3959 from CollenN/mutrace-final 
Finalizes Mutantrace Datum Update
 2014-06-20 21:47:54 -05:00
CollenN d50c2b9ec9 Adds Radioactive Microlaser 
Adds the radioactive microlaser, a device disguised as a health analyzer
used to irradiate people, as a traitor item. It costs 4 telecrystals to
purchase, and is fairly powerful in clever hands.

The strength of the radiation is determined by the 'intensity' setting,
while the delay between the scan and the irradiation kicking in is
determined by the wavelength.

Each scan will cause the microlaser to have a brief cooldown period.
Higher intensity will increase the cooldown, while higher wavelength
will decrease it.

Wavelength is also slightly increased by the intensity as well.
 2014-06-20 20:58:14 -04:00
Cheridan 06edd41bab Merge pull request #3889 from Kelenius/OfCyborgsAndModules 
Of cyborgs and modules
 2014-06-20 15:03:15 -05:00
Miauw 80a093643c Removes confusion because players cannot understand my genius. 2014-06-20 14:55:04 +02:00
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