853009f7e0
Merge pull request #8157 from Xhuis/shadowling_gamemode
...
Shadowling (MERGE-READY!!)
2015-04-11 17:51:23 +02:00
c9338f7212
Shadowling: RELEASE EDITION
2015-04-11 11:42:02 -04:00
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
e2c869bc77
- Adds generic action and action buttons system
2015-04-11 17:06:43 +02:00
260d205598
- Adds Martial Art datum and Three styles
2015-04-11 16:32:20 +02:00
075328fa62
Merge branch 'master' of https://github.com/tgstation/-tg-station into SpaceCarpTatorItem
2015-04-11 14:40:35 +01:00
bfbc7c40a8
Should be up to date now.
2015-04-11 14:39:37 +01:00
c925e8019e
Merge pull request #8802 from Zelacks/defibModify
...
Removes the minimum damage requirement for defibs
2015-04-11 15:26:05 +02:00
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
0e0f8c4720
Fixed code, carp won't attack owner, corrected spelling.
2015-04-11 03:48:08 +01:00
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
5c4806fd6e
Fixed merge conflict. Restored icon_states for crates.
2015-04-10 17:40:49 +01:00
3c3c87aeae
Merge remote-tracking branch 'upstream/master' into fixfixfix
...
Conflicts:
_maps/map_files/generic/z2.dmm
2015-04-10 17:17:35 +01:00
9954ae158c
Health Analyzers can now detect cybernetic implants.
2015-04-10 17:10:56 +01:00
17bee43b49
Added cybernetic implant spawner to nuke ops ship medbay.
2015-04-10 16:54:32 +01:00
e11a913f23
Fixed Nutriment printing bug. Added new Reviver implant.
2015-04-10 16:30:39 +01: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
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
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
a405022ac9
State fixes
2015-04-09 16:27:39 +10: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
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
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
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
c5f6f5ff2c
Merge pull request #8812 from Jalleo/Removal
...
Removal of empty file
2015-04-08 08:44:43 -05:00
f537b43108
Merge pull request #8789 from phil235/BeartrapFix
...
Pull, resist, beartraps
2015-04-08 08:38:01 -05:00
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
ffbef1f7d9
inversed check fix
2015-04-08 16:22:51 +10:00
60cf76c881
fixes
2015-04-08 16:11:56 +10:00
37277f66e7
pre-map compile
2015-04-08 15:40:41 +10:00
6103b2a5e1
Fixes Spraycans not coloring faces correctly
...
* Changes Spraycans and lipstick to use a fully tintable overlay.
* Lipstick now comes in more colors and (codewise) can be changed with one var.
* Spraycans now color the face overlay correctly, racism for everyone!
2015-04-08 15:02:32 +10:00
c06ad7e6b8
moved process() to datum. made /datum/reagents/ process instead of the containers.
2015-04-07 17:13:59 -07:00
2cb387af90
Adds proximity/stat/etc. check and removes bloat
2015-04-07 19:52:14 -04:00
54154bec12
Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive
2015-04-07 16:21:07 -07:00
73e4502a64
outer +/- hrefs in tank pressure gui change pressure by 5kPa instead of 10 now
2015-04-08 00:00:39 +02:00
6b83575b28
Merge branch 'master' of https://github.com/tgstation/-tg-station into BeartrapFix
...
Conflicts:
code/modules/mob/living/living.dm
2015-04-07 20:27:37 +02:00
34a2b3be5b
Flying animals no longer triggers mines and mousetraps.
...
Space carps are flying animals now.
Adding changelog
2015-04-07 20:20:29 +02:00
af99eea983
okay
2015-04-07 18:57:30 +01:00
cb6bae5e52
-Defibs no longer have a minimum damage requirement. Previously the body required to be damaged in order to be defibbed (Required to be damaged, atleast 200 units). I can only assume that this was the case because the author had math that needed the body to have atleast 200 units of damage for it to work correctly, but I assume that the author naively thought it was impossible to heal corpses.
...
--Defibs now restore the health of the user to halfway between crit and death (-50 health or 150 sustained damage). If the user has little damage sustained, they will receive oxyloss to place them to the halfway point. If the corpse has more damage than the halfway point, they will be healed to the halfway point, in a ratio based on how much they sustained in each type of damage they took.
--Defibs will not heal cloneloss, and will still damage/heal the patient to the halfway point including the cloneless (eg a patient who is 0/0/0/0 with 30 cloneless receives 120 oxyloss). If the patient has too much cloneloss, they will heal fully, except they will still have the cloneloss (eg, they will be 0/0/0/0 with 180 cloneloss on revival)
--Additonal feedback given for some failure states for the defib.
2015-04-07 18:28:32 +08:00
e957233907
Merge pull request #8772 from MrPerson/foam_fixarooney
...
Fixes cleaner grenades
2015-04-06 16:09:35 -07:00
1f6a6b0e8c
Merge branch 'master' of https://github.com/tgstation/-tg-station into AlienIconUpdateFix
...
Conflicts:
code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
code/game/objects/structures/stool_bed_chair_nest/bed.dm
2015-04-06 19:38:51 +02:00
8499413649
Makes living/verb/resist more object oriented.
...
Adds a fourth mob size "MOB_SIZE_TINY" to differentiate corgi size and mouse size. (used in bear trap code)
Rewrites beartrap/Crossed() to have less istype checks.
Adds a flying var to simple animals (used in bear trap code)
Makes pulling update in living/life.dm() to fix pulling not stopping when you're incapacitated.
2015-04-06 18:45:37 +02:00
062d0c2086
Merge pull request #8759 from optimumtact/patch-3
...
Fix can_speak check in megaphone
2015-04-06 08:48:49 -05:00
Swag McYolosteinen
Xhuis
phil235
AnturK
CosmicScientist
phil235
Sawu
Cheridan
xxalpha
Orange Borg
Jordie0608
GunHog
oranges
Iamgoofball
norill
blah
Zelacks
hornygranny