94b8f0db16
Merge pull request #8733 from MrPerson/cold_slowdown_speedup
...
Reduces penalty to movespeed from being cold
2015-04-10 12:48:39 -05:00
72eacad839
Merge pull request #8854 from MrStonedOne/thisshouldmakethingseasier
...
Minor permission panel fixes
2015-04-10 12:40:55 -05:00
d04b0a299d
Merge pull request #8856 from Incoming5643/death_is_not_my_end
...
Adds stat checks to all AI malf powers that lack them
2015-04-10 12:37:19 -05:00
dcdb922d04
Fixed inbuilt jetpack not working for non engine hardsuits.
2015-04-10 18:08:52 +01:00
1736ba7af3
Merge pull request #8130 from Ikarrus/conversiontimeout
...
Conversions and De-conversions briefly stuns you
2015-04-11 00:50:14 +10:00
eb23f23bb8
Add a comment for future
2015-04-10 22:40:06 +12:00
0266b4d6ed
Restore holding null check
...
Apparently this broke a lot of stuff
2015-04-10 22:30:58 +12:00
0570ec92c7
Fix electronics check in airlock code
...
Because needhand defaults to 1 (on) it was always returning false as the item was dropped before the do_after check
2015-04-10 21:42:57 +12:00
69f1b38479
Merge pull request #8838 from optimumtact/hearmeroar
...
Fix megaphone having an audible range of one
2015-04-10 01:01:57 -05:00
4804ef1f01
Merge pull request #8843 from Wolfie13/MyFavoriteItem
...
Added Description Text for Pet Collars
2015-04-09 23:50:02 -05:00
40d1c3e347
Merge pull request #8863 from Iamgoofball/patch-53
...
Fixes slime core dupe bug
2015-04-10 14:38:25 +10:00
23f31693fa
Merge pull request #8739 from phil235/FoodRecipes2
...
A whole new bunch of foods and drinks
2015-04-09 23:28:31 -05:00
16a25f3dd8
Fixes slime core dupe bug
...
why the fuck this didn't throw an error is beyond me.
2015-04-09 20:49:07 -07:00
ea1967162d
Grants Cargo Techs access to the Ore Redeemer!
...
Cargo Technicians may now release ore from the Ore redeemer.
2015-04-09 18:11:58 -05:00
761985ce80
Merge pull request #8801 from xxalpha/fixfixfix
...
Implant Hotfix
2015-04-09 13:45:32 -07:00
d1892cffbe
Organizes the various continuous_round_x config options into one set of config options continuous. Functionality is only there for the same mode that already had that functionality, everything else is continuous always
...
Makes another set of config options for which rounds types, if any, use the midround antagonist (mulligan) system. Keep in mind this is by definition a subset of round with continuous set. Again this feature is only present for the roundtypes where I KNOW it works properly, other modes can't use midround antags.
The check antagonist screen will show how the game will behave when all the antagonists die, and it can be changed on the fly by admins, the four possible states are:
End on antagonist death (noncontinuous rounds)
Continue if antagonists die (unsupported continuous by default round)
Continue if antagonists die, creating replacement antagonists (continuous, using midround antags)
Continue if antagonists die, not creating new antagonists (continuous, not using midround antags)
When rounds prepare to mulligan admins will additionally get the option to just keep the round going without any automatically created antags in case they want to run their own shinanagans instead. They can also as before choose to end the round.
2015-04-09 16:03:11 -04:00
0d8bbb8c14
oh right, canUseTopic basically IS isDead
2015-04-09 14:57:03 -04:00
76940f40f7
trims the fat a bit with a tiny tiny proc
2015-04-09 13:34:26 -04:00
3017a1362a
Adds stat checks to all AI malf powers that lack them, as well as one for buying powers in the first place. Standardizes the message a bit, never mind the pasta, verbs suck like that.
2015-04-09 13:04:33 -04:00
4ef5aa93dc
Merge branch 'master' of https://github.com/tgstation/-tg-station into FoodRecipes2
...
Conflicts:
icons/obj/food.dmi
2015-04-09 17:38:14 +02:00
13baa6e3cb
Merge branch 'master' of https://github.com/tgstation/-tg-station into KineticAcceleratorNerf
...
Conflicts:
code/modules/projectiles/projectile/special.dm
2015-04-09 17:27:55 +02:00
c786ca7c54
Merge pull request #8814 from Fayrik/AllTheSmallThings
...
I dun goofed.
2015-04-09 17:08:53 +02:00
06f09fcd81
Merge pull request #8830 from Jordie0608/howdoyouknowyourbestfriendisntsecretlyawizard
...
Icon_door customability fix
2015-04-09 14:27:30 +02:00
ddb5ffe324
Merge pull request #8582 from Xhuis/two_devices
...
Adds pizza bomb
2015-04-09 12:58:57 +02:00
b4616ad09b
Merge pull request #8731 from optimumtact/patch-2
...
stun batons no longer lose charge over time
2015-04-09 12:51:40 +02:00
2b83512dc9
- Headslug fixes
2015-04-09 12:44:21 +02:00
5b2221cd4f
Changing/adding an admins rank now updates the player's table
2015-04-09 03:19:55 -07:00
af35d31bd9
Fixes the rank button on player panel
2015-04-09 03:19:20 -07:00
3ed097265f
Fix #8851
...
also fixes unbucking and cuff breaking.
2015-04-09 17:18:22 +09:00
a405022ac9
State fixes
2015-04-09 16:27:39 +10:00
53775cee74
Merge pull request #8775 from Incoming5643/PLEASE_MULLIGAN_WE_CAN_WORK_THROUGH_THIS_I_LOVE_YOU_MAN_PUT_DOWN_THE_GUN
...
Fixes another instance where the mulligan system just starts screaming at admins instead of doing anything
2015-04-09 00:29:04 -05:00
e170ee88ce
Merge pull request #8804 from AnturK/signsdelay
...
Adds delay to picket sign waving
2015-04-09 00:26:08 -05:00
58a362b2f1
Merge pull request #8822 from sawu-tg/blackface
...
Fixes Spraycans not coloring faces correctly (and changes up lipstick)
2015-04-09 00:20:23 -05:00
e31859a37e
Merge pull request #8734 from MrPerson/holidazed_and_confused
...
April Fool's lasts only 2 days plus another holiday
2015-04-09 00:15:24 -05:00
3bee31dd7f
Merge pull request #8687 from phil235/ProjectileFix1
...
Makes projectile non dense.
2015-04-09 00:12:56 -05:00
49f6888977
I'm just going to throw in a minor change to gang's end-round reporting to make it easier to read the membership report
2015-04-08 21:47:00 -06:00
246fe2fbd5
Flash conversions do not knock down the target
2015-04-08 21:28:05 -06:00
22deb5b46e
Added Description Text for Pet Collars
...
Because we know they're not some sort of space-tie.
2015-04-09 04:15:38 +01:00
09cdd923d8
Merge branch 'master' of https://github.com/tgstation/-tg-station into conversiontimeout
2015-04-08 21:03:54 -06:00
6c1a7eba8f
Merge pull request #8732 from optimumtact/targethelper
...
Add an optional target var to the do_after helper
2015-04-09 03:02:35 +01:00
3f762ee6b5
PDA Upgrade and Bot Fixes
...
-The Captain's PDA can now access multiple bots!
- The Captain and HoP PDAs can now also remotely access Newscasters!
- Bot radio code now no longer uses filters to allow for multi-access
radio control.
- Bots can now patrol while off station.
2015-04-08 20:12:01 -05:00
8a5696a033
Fix megaphone having an audible range of one
2015-04-09 10:57:30 +12:00
c8931f4cfc
Only actual internals masks work now for internals.
2015-04-08 21:08:16 +03:00
939b5552ad
Merge pull request #8534 from Jordie0608/allgoodideasstartwithamistake
...
Fixes #8529 , confirmation check for BoH bombing
2015-04-08 20:01:35 +02:00
e6e0143ec5
Merge branch 'master' of https://github.com/tgstation/-tg-station into FoodRecipes2
...
Conflicts:
_maps/map_files/MiniStation/MiniStation.dmm
_maps/map_files/MiniStation/z2.dmm
code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
2015-04-08 19:36:49 +02:00
a0ea5dfefe
Merge branch 'master' of https://github.com/tgstation/-tg-station into ProjectileFix1
...
Conflicts:
code/modules/mob/living/simple_animal/friendly/cat.dm
code/modules/mob/living/simple_animal/friendly/corgi.dm
code/modules/mob/living/simple_animal/friendly/farm_animals.dm
code/modules/mob/living/simple_animal/friendly/lizard.dm
code/modules/mob/living/simple_animal/friendly/mouse.dm
code/modules/mob/living/simple_animal/hostile/bees.dm
2015-04-08 19:10:20 +02:00
f114768c1d
it broke
2015-04-08 19:17:18 +03:00
fdcae0a7ba
- Turns alien abilites into proc holders
2015-04-08 16:56:43 +02:00
0685e87341
- Adds delay to picket signs
2015-04-08 16:21:19 +02:00
24d047a116
icon_door customability fix
2015-04-09 00:05:16 +10:00
Cheridan
xxalpha
Jordie
Orange Borg
Iamgoofball
GunHog
hornygranny
Incoming
phil235
phil235
AnturK
MrStonedOne
bear1ake
Ikarrus
Wolfie13
Remie Richards
oranges
kingofkosmos