Jordie
210eedbb48
Merge pull request #8841 from GunHog/Bot_Radio_And_Newscasters
...
Bot fixes and PDA upgrades!
2015-04-16 18:18:44 +10:00
Cheridan
87edea4eab
Merge pull request #8969 from phil235/BundleFix2
...
Another bundle of fixes
2015-04-15 21:08:13 -05:00
Swag McYolosteinen
36cac2405d
Merge pull request #8932 from Iamgoofball/patch-56
...
Fixes incendiary grenades
2015-04-15 13:03:03 +02:00
Cheridan
26a974a8c3
Merge pull request #8943 from MrPerson/ied_fixes
...
IED fixes
2015-04-14 19:40:50 -05:00
phil235
d5318a033b
Merge pull request #8933 from Cheridan/snackbar
...
New barsign!
2015-04-15 00:33:18 +02:00
phil235
2ed906b990
Fixes inhand sprites for eggs.
...
Fixes heart underwear sprite being too big.
Fixes being able to push a janicart through plastic flaps.
Fixes ERT medic closet starting with a combat defib with no cell. Empty combat defib can now get a cell inserted.
Fixes inconsistency in nukeop pinpointer upon activation, it now says standard pinpointer message plus the current mode (shuttle or disk).
2015-04-14 17:41:36 +02:00
Xhuis
87541dabc2
Progress
2015-04-13 19:12:29 -04:00
MrPerson
0a6fb70137
IED fixes
...
Fixes #8919 - can pixel_x/pixel_y is inherited by the IED after construction
Fixes an unreported issue where the can underlay of IED's would be rendered underneath your HUD when it was in your hands.
2015-04-13 07:00:19 -07:00
Jordie
77cd7476a1
Merge pull request #8872 from optimumtact/patch-1
...
Fix electronics check in airlock code
2015-04-13 18:25:05 +10:00
Jordie
d8ef9ecb44
Merge pull request #8777 from CosmicScientist/SpaceCarpTatorItem
...
Adds space carp traitor item and carp plushie "attack"
2015-04-13 18:22:53 +10:00
Jordie
e6143f6493
Merge pull request #8810 from AnturK/everybodywaskungfufighting
...
Adds martial art datum and three styles
2015-04-13 18:22:37 +10:00
Jordie
ae120db87c
Merge pull request #8728 from AnturK/action_button
...
Generic Action\Action Button System
2015-04-13 18:22:08 +10:00
Iamgoofball
0dd03a7201
you didn't see anything
2015-04-12 19:13:24 -07:00
Cheridan
729be13486
New barsign!
...
In honor of https://www.reddit.com/r/SS13/comments/322cm1/ss13_confirmed_isis_recruitment_shill/
We need more subliminal messages to appease our ISIS overlords
2015-04-12 21:00:24 -05:00
Iamgoofball
18207ae363
Fixes incendiary grenades
2015-04-12 18:02:22 -07:00
Cheridan
141d577bba
Merge pull request #8895 from phil235/WindowFix
...
Windows, CPR, lipstick fixes
2015-04-12 13:06:42 -05:00
Swag McYolosteinen
ffd0db2b7b
Merge pull request #8581 from MrPerson/lighting_2015
...
Object based lighting system
2015-04-12 13:14:32 +02:00
Jordie
dc3cc0295a
Merge pull request #8887 from sawu-tg/spray2
...
Fixes Spraycans bugs
2015-04-12 13:44:36 +10:00
CosmicScientist
6f357b1d63
Merge branch 'master' of https://github.com/tgstation/-tg-station into SpaceCarpTatorItem
2015-04-11 22:11:10 +01:00
phil235
5f169e8e47
Remove SpeciesCanConsume() proc, replaced by iscarbon checks.
...
Remove alloweat var from masks, remove MASKCOVERSMOUTH flag from mime and clown masks so you can still eat through them.
Some adjustments in surgery checks for bodyparts covered.
Fixes a runtime in weapon/energy attack_verb.
Humans can now CPR monkeys.
Slight changes to CPR code.
Fixes runtime with drones trying to do CPR.
Rewrites /obj/item/weapon/reagent_containers/proc/canconsume to be less shitty.
Adds an is_mouth_covered() proc to carbons to check for mask and headgear with MASKCOVERSMOUTH or HEADCOVERSMOUTH, with argument to restrict the check to only mask or only head.
2015-04-11 22:16:42 +02:00
Swag McYolosteinen
853009f7e0
Merge pull request #8157 from Xhuis/shadowling_gamemode
...
Shadowling (MERGE-READY!!)
2015-04-11 17:51:23 +02:00
Xhuis
c9338f7212
Shadowling: RELEASE EDITION
2015-04-11 11:42:02 -04:00
phil235
6996897b65
Fixes fulltile windows not spawning the correct amounts of shards and rods.
...
Fixes broken grille not dropping a rod when shot with buckshots.
2015-04-11 17:41:09 +02:00
AnturK
e2c869bc77
- Adds generic action and action buttons system
2015-04-11 17:06:43 +02:00
AnturK
260d205598
- Adds Martial Art datum and Three styles
2015-04-11 16:32:20 +02:00
CosmicScientist
075328fa62
Merge branch 'master' of https://github.com/tgstation/-tg-station into SpaceCarpTatorItem
2015-04-11 14:40:35 +01:00
CosmicScientist
bfbc7c40a8
Should be up to date now.
2015-04-11 14:39:37 +01:00
phil235
c925e8019e
Merge pull request #8802 from Zelacks/defibModify
...
Removes the minimum damage requirement for defibs
2015-04-11 15:26:05 +02:00
Sawu
850673c684
Fixes Spraycans bugs
...
* Fixes Spraycans being used at a range
* Fixes Spraycans not consuming ammo when used as a stun.
* Changes the stun mechanic, so people with eye protection are only blinded, without it they are stunned fully.
2015-04-11 14:27:25 +10:00
CosmicScientist
0e0f8c4720
Fixed code, carp won't attack owner, corrected spelling.
2015-04-11 03:48:08 +01:00
Cheridan
a4ad75c91f
Merge pull request #8815 from norill/tank_gui
...
Tank GUI buttons change pressure by +-5 instead of 10
2015-04-10 14:29:21 -05:00
Orange Borg
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
Cheridan
69f1b38479
Merge pull request #8838 from optimumtact/hearmeroar
...
Fix megaphone having an audible range of one
2015-04-10 01:01:57 -05:00
phil235
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
phil235
06f09fcd81
Merge pull request #8830 from Jordie0608/howdoyouknowyourbestfriendisntsecretlyawizard
...
Icon_door customability fix
2015-04-09 14:27:30 +02:00
phil235
ddb5ffe324
Merge pull request #8582 from Xhuis/two_devices
...
Adds pizza bomb
2015-04-09 12:58:57 +02:00
phil235
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
Jordie0608
a405022ac9
State fixes
2015-04-09 16:27:39 +10:00
Cheridan
e170ee88ce
Merge pull request #8804 from AnturK/signsdelay
...
Adds delay to picket sign waving
2015-04-09 00:26:08 -05:00
Cheridan
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
GunHog
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
oranges
8a5696a033
Fix megaphone having an audible range of one
2015-04-09 10:57:30 +12:00
phil235
939b5552ad
Merge pull request #8534 from Jordie0608/allgoodideasstartwithamistake
...
Fixes #8529 , confirmation check for BoH bombing
2015-04-08 20:01:35 +02:00
phil235
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
AnturK
0685e87341
- Adds delay to picket signs
2015-04-08 16:21:19 +02:00
Jordie0608
24d047a116
icon_door customability fix
2015-04-09 00:05:16 +10:00
Cheridan
c5f6f5ff2c
Merge pull request #8812 from Jalleo/Removal
...
Removal of empty file
2015-04-08 08:44:43 -05:00
Cheridan
f537b43108
Merge pull request #8789 from phil235/BeartrapFix
...
Pull, resist, beartraps
2015-04-08 08:38:01 -05:00
Jordie0608
ad33641101
Merge branch 'master' of https://github.com/tgstation/-tg-station into howdoyouknowyourbestfriendisntsecretlyawizard
...
Conflicts:
code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
code/game/objects/structures/crates_lockers/closets/secure/medical.dm
icons/obj/closet.dmi
2015-04-08 22:51:45 +10:00
Jordie0608
ffbef1f7d9
inversed check fix
2015-04-08 16:22:51 +10:00
