coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
12,265 Commits 9 Branches 11 Tags
8d4e73a4933948cf06c5bcbdcc051e02390fa48f
Commit Graph

9830 Commits

Author SHA1 Message Date
Cheridan 8d4e73a493 Merge pull request #3885 from Giacom/gravity_bounce 
Zero gravity bouncing.
 2014-06-11 20:33:52 -05:00
Alex 54ac7f0914 Merge pull request #3873 from Ikarrus/boxpolishjune2014 
Map Update 8/6/14
 2014-06-11 12:15:36 +01:00
Alex a0f0f5b48f Merge pull request #3849 from Ikarrus/transpulls 
Pulled objects will transition with mobs changing Z-levels via space
 2014-06-11 12:11:18 +01:00
Alex 17dfe57509 Merge pull request #3803 from Cheridan/pills_here 
Pill fixes
 2014-06-11 12:10:23 +01:00
Alex 4d8a2f5406 Merge pull request #3800 from phil235/RoboFabSyncFix 
Syncing a robotics fabricator no longer clears its queue
 2014-06-11 11:45:19 +01:00
Alex 6f99c8581f Merge pull request #3806 from Walter0o/exploit_fix 
fixes exploits with the mech fabricator (/tg/)
 2014-06-11 11:44:44 +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
Alex a4cedc741e Merge pull request #3848 from Rockdtben/roboticHealRefactor 
Moved item_heal_robotic out of obj/item and into mob_helpers.dm
 2014-06-11 11:39:20 +01:00
Alex cdea0af584 Merge pull request #3846 from hornygranny/idedplsnerf 
magic missile stun reduced from 5 to 3
 2014-06-11 11:39:00 +01:00
Alex 67f4808ca5 Merge pull request #3834 from phil235/DebrainMaskFix 
Fixes being unable to debrain patient wearing breathmask
 2014-06-11 11:38:32 +01:00
Cheridan 84051f9d46 Merge pull request #3850 from Ikarrus/ideater 
Tcomms Traffic Control no longer eats ID cards
 2014-06-10 09:47:16 -05:00
Cheridan 29386858c7 Merge pull request #3878 from Ikarrus/stripfix 
Fixes stripping stunned/dead people
 2014-06-10 09:35:21 -05:00
Cheridan 9125d1cd2c Merge pull request #3867 from Rockdtben/SecurityRecord 
Paperwork and Record Console Updates
 2014-06-10 00:02:44 -05:00
Rockdtben 027d4c8bf7 Added printing sound. 2014-06-09 18:39:20 -05:00
Rockdtben 1e5a31438a Fixed issues with new records. 2014-06-09 18:22:39 -05:00
Giacomand 6f61d000b0 Finalized gravity bouncing. 2014-06-09 21:09:16 +01:00
Giacomand f4b0a48253 Merge branch 'master' of https://github.com/tgstation/-tg-station into gravity_bounce 
Conflicts:
	code/modules/mob/living/living.dm
	code/modules/mob/mob_movement.dm
	code/modules/power/gravitygenerator.dm
 2014-06-09 20:26:17 +01:00
Cheridan 13f097ca9a Merge pull request #3853 from phil235/AlienCuffBreakFix2 
Alien roars instead of screaming when breaking cuffs.
 2014-06-09 14:20:08 -05:00
Cheridan b827a3b5f2 Merge pull request #3862 from Kelenius/OfSlimesAndCommands 
Of slimes and commands
 2014-06-09 12:39:52 -05:00
ikarrus df7b758d34 Fixes stripping stunned/dead people 
Fixes #3877
 2014-06-09 08:51:38 -06: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
Rockdtben 1fcd5d3ad7 Converted Major and Minor Crimes into Lists. 2014-06-07 21:00:31 -05:00
Alex 98b2e54960 Merge pull request #3843 from EdwardRech/master 
Grammar
 2014-06-08 00:03:54 +01:00
Rockdtben e28986274a Fix'd a typo 2014-06-07 16:45:23 -05:00
Rockdtben be7dbf1e23 updated color 2014-06-07 16:24:41 -05:00
Rockdtben 35a3c44fe4 Modified the Medical Console to display data in a way similar to the Security Console. 2014-06-07 16:15:21 -05:00
Cheridan fe26d167f7 Merge pull request #3847 from Rockdtben/RefactorSoulstone 
Moved these 2 procs out of obj/items/ and to obj/items/devices/soulstone
 2014-06-07 15:34:52 -05:00
Rockdtben 5770380ca5 IDs insert into the medical records console when hit with an ID now. 2014-06-07 14:17:03 -05:00
Rockdtben c83c126839 Medical Records too now. 2014-06-07 14:09:28 -05:00
Rockdtben 701b9be244 Changed title of security record paper. 
Instead of the paper being named

paper - 'Security Record'

SR-[num] '[charactername]'

SR-1 'Persh Ullman'
For example

Also title within the record

Security Record

has been changed to

Security Record - (SR-1)

This makes identifying security records without having to rename them and also adds a better paper trail to security records.
 2014-06-07 13:43:21 -05:00
Kelenius 9e78e71537 Right 2014-06-07 13:37:36 +04:00
ikarrus fba49381b2 Giacom's Feedback 2014-06-06 22:25:51 -06:00
phil235 ed42dd2d58 Merge pull request #8 from tgstation/master 
update repo
 2014-06-06 20:16:35 +02:00
phil235 1dfaa6711a overriding cuff_break proc 2014-06-06 20:10:35 +02:00
phil235 f9c2b9d6d8 Aliens stop screaming like hulk when breaking handcuffs 2014-06-06 20:10:26 +02:00
Cheridan e6ba75c190 Merge pull request #3845 from Giacom/refuel_fix 
Fixed the "shuttle refueling, x minutes remaining" being incorrect.
 2014-06-06 12:41:44 -05:00
Cheridan c4aebda258 Merge pull request #3421 from GunHog/AI_Lockdown 
Gives Malfuncting AIs the Hostile Lockdown ability!
 2014-06-06 12:17:53 -05:00
Alex 9b083e95ac Merge pull request #3841 from ike709/2014-06-04-#3788-Fix 
Fixes #3788 Animals retaliating after death
 2014-06-06 09:17:36 +01:00
ikarrus cdd70de336 Tcomms Traffic Control no longer eats ID cards 
Fixes #1340
 2014-06-05 20:11:40 -06:00
ikarrus c91f0504c7 Pulled objects will transition with mobs changing Z-levels via space 
Recreation of #3676

Fixes #244
 2014-06-05 19:51:30 -06:00
ike709 a6aca7617f Removed useless changes from first commit. 2014-06-05 20:33:07 -05:00
ike709 8708a65016 None of the animals should retaliate while dead. 2014-06-05 20:19:19 -05:00
Rockdtben 569d12facf Moved item_heal_robotic out of obj/item and into mob_helpers.dm 2014-06-05 19:25:08 -05:00
Rockdtben 1725d633fb Moved these two procs out of obj/items/ and to obj/items/devices/soulstone 
transfer_soul(var/choice as text, var/target, var/mob/U as mob).
init_shade(var/obj/item/device/soulstone/C, var/mob/living/carbon/human/T, var/mob/U as mob, var/vic = 0)

Fix some poor formatting in soulstone.dm
 2014-06-05 18:34:06 -05:00
Hornygranny 7a21c3869e magic missile stun reduced from 5 to 3 2014-06-05 14:14:04 -07:00
Alex 7d607d0bde Merge pull request #3826 from Ikarrus/obscuredstrip 
Strip Menu now obscures items based on flags_inv
 2014-06-05 21:43:52 +01:00
Alex d0db8fdbed Merge pull request #3832 from phil235/StunprodFix 
Stunprod Fix
 2014-06-05 21:40:45 +01:00
Alex 6cce892cf6 Merge pull request #3831 from CollenN/bogemagchance 
Fixes typo in ion_storm New()
 2014-06-05 21:38:43 +01:00
Giacomand 950835555c Fixed the "shuttle refueling, x minutes remaining" being incorrect. 2014-06-05 20:00:26 +01:00