Commit Graph

9770 Commits

Author SHA1 Message Date
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
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
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
Cheridan
0b6238e2c1 Merge pull request #3813 from RemieRichards/30/05/2014-Autoshuttlecallimprovements
Improves shuttle autocall() [Fixes #1422]
2014-06-05 00:47:52 -05:00
ike709
85de677d1b Fixed issue #3788. Message "[src] gets an evil-looking gleam in \his eye" no longer displays when Pete is dead. 2014-06-04 01:12:29 -05:00
Cheridan
a4fada7e95 Merge pull request #3837 from phil235/WireCutSpaceFix
Fix not being able to cut cable over space tile
2014-06-03 21:55:24 -05:00
Cheridan
e1cb4b6d8a Merge pull request #3827 from Ikarrus/whatareyoulookingat
You now face what you are examining when using the verb
2014-06-03 21:00:58 -05:00
ikarrus
8e94bff33c -Giacom's Feeback
-Belt, ID, and Pockets are no longer blocked by exosuits, as they are still visible
2014-06-02 21:07:21 -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
d4163a04f1 Fix not being able to cut cable on space tile 2014-06-02 20:47:51 +02:00
ikarrus
ce35503695 Greyed out empty slots for easier readability 2014-06-01 22:45:28 -06:00
ikarrus
8cd20b3e77 Added checks in Topic() 2014-06-01 21:12:06 -06: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
CollenN
5c69101766 Fixes typo in ion_storm New()
I have no idea why you'd want to emag a bog, or how you'd emag a bog.
But regardless, you can now properly set the botEmagChance through
New().
2014-06-01 15:22:50 -04:00
Miauw62
44f769208c Merge pull request #3804 from Cheridan/roboShlock
Fixes Robocop board not working
2014-06-01 12:16:16 +02:00
ikarrus
5a7db48f96 Improved readability of the strip panel with <BR>s 2014-05-31 14:26:48 -06:00
ikarrus
d50eaaa624 You now face what you are examining when using the verb 2014-05-31 14:11:42 -06:00
ikarrus
e47b75c02f Strip Menu now obscures items based on flags_inv
I also made it look pretty
2014-05-31 13:45:14 -06:00
Alex
b97fd1f884 Merge pull request #3809 from Cheridan/eugh
Removes a word from ion_storm.dm
2014-05-31 17:58:46 +01:00
Cheridan
47eeeefe31 Merge pull request #3731 from Ikarrus/internalshelp
You can now set internals on someone else's belt and suit storage
2014-05-31 11:43:47 -05:00
Cheridan
4d7f754757 Merge pull request #3802 from Perakp/noclone
Fixes clonable husks
2014-05-31 11:34:07 -05:00
Cheridan
7655223e8d Merge pull request #3793 from rbreslow/master
Fixed grammatical a mistake in atmospherics.dm
2014-05-31 11:29:00 -05:00
Miauw62
030647d6cc Merge pull request #3718 from hornygranny/cheeseallthewaydown
sliceable snacks no longer infinitely stack
2014-05-31 13:56:03 +02:00
inorix
25d8ffbcdf Fixes borg naming rejecting numbers in name 2014-05-31 11:43:12 +02:00
Robson Richards
26f737001a Removes gamemode check 2014-05-30 23:10:53 +01:00
Hornygranny
c71f289c3c changed false comment 2014-05-30 10:13:22 -07:00
Robson Richards
19dec21156 Removes power check due to possible increase in shuttle calls because >Engineering >Competent 2014-05-30 14:40:30 +01:00
Robson Richards
d0018d17de Improves shuttle autocall() to add some needed checks and moving of gamemode check 2014-05-30 03:12:18 +01:00
Hornygranny
9bb79d6888 removed things handled by unEquip 2014-05-29 10:39:31 -07:00
Cheridan
3c7897f6de removes a word from ion_storm.dm 2014-05-28 23:29:35 -05:00
Miauw62
cc7760c628 Merge pull request #3750 from hornygranny/tablethisfornow
fixes #3746 fixes #3706
2014-05-28 18:58:11 +02:00
Cheridan
5aa17924b3 Fixes Robocop board not working 2014-05-27 15:59:10 -05:00
Hornygranny
c4a3d8dbe8 redundant w_class removed 2014-05-27 13:56:43 -07:00
Hornygranny
bc582490db storing moved to sliceable/store/attackby() 2014-05-27 13:52:56 -07:00
Hornygranny
af2e792036 2oop4u 2014-05-27 12:07:53 -07:00
Hornygranny
6b7d3f49a9 muh OOP 2014-05-27 10:40:15 -07:00
Cheridan
4112f9e8ec Merge pull request #3792 from CollenN/2meta4me
Removes intercept meta
2014-05-27 10:46:01 -05:00
Perakp
7283713d98 Fixes #3776 2014-05-27 12:44:51 +03:00
Alex
67482d6e87 Merge pull request #3794 from Menshin/power_distribution_tweaks
Power distribution tweaking
2014-05-27 10:04:25 +01:00
Francis Devine
2e656dd21a remove terrible joke
Remove terrible joke
2014-05-26 11:33:24 +12:00
Ikarrus
26813fc6ac What is this it shouldn't be here.
It's gone now
2014-05-25 11:15:41 -06:00
Ikarrus
769a220740 I honestly don't remember making these changes before 2014-05-25 11:10:52 -06:00
ikarrus
82b861702f Resolved Conflicts:
code/modules/mob/living/simple_animal/constructs.dm
2014-05-25 10:59:08 -06:00
Miauw62
6c537b45c1 Merge pull request #3791 from phil235/WindowSndFix
Fix for window unwrenching noise
2014-05-25 14:19:22 +02:00