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
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
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
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
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
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
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
2cb387af90
Adds proximity/stat/etc. check and removes bloat
2015-04-07 19:52:14 -04: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
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
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
1da595b535
Merge pull request #8737 from RemieRichards/NinjaCleanup2
...
A restructure/removal/cleanup of Ninja Code [Part 2] - Abilities and stuff
2015-04-05 21:54:33 -05:00
13060bb6f4
Adds space carp traitor item and fun for carp plushie.
2015-04-06 02:04:16 +01:00
27625530e3
Kenny Loggins
2015-04-05 19:13:23 -04:00
cbbd5897ee
Fixes typos, rice pudding recipe changed, maxvolume and bitesize for superbiteburger and stew changed, cookbook updated.
2015-04-05 16:48:50 +02:00
a5306ba1e0
Fix can_speak check in megaphone
...
The original check actually made no sense, but worked because it returned false every time as there was never a message passed through
2015-04-05 20:29:07 +12:00
6550016ee6
Merge pull request #8723 from kingofkosmos/grammarfixes
...
Recieve --> Receive
2015-04-04 20:00:21 +02:00
f9f618d699
Adding the chemical reactions and recipes for the new recipes.
...
Changes the glasses of what? to use an overlay with reagents color.
Adding a ricepack to the kitchen cabinet and the food crate.
Adding more bowl to the dinnerware vending machine.
Adding pumpkinjuice, blumpkingjuice, cherryshake, bluecherryshake pumpkin latte, drunken blumpkin reagents.
2015-04-04 19:29:12 +02:00
5e93f57873
Fixes energy katana emag spam. Fixes energy nets not anchoring their target. Fixes runtime from upgrading suit cell. Ninja stars ability changed to summon one obj/item/weapon/throwing_star/ninja with throw mode auto toggle on for instant throwing. Added ninja sword recall, Allowing the ninja to recall their sword back to themselves, if they can see the sword the ability is free, and the sword throws itself towards the ninja, hitting people as it does so.
2015-04-04 18:17:37 +01:00
6d4f3b60f8
Merge pull request #8663 from dannno/sadclown
...
sad trombone for clown pda
2015-04-04 20:58:21 +11:00
6d34032385
Merge pull request #8628 from Fayrik/AllTheSmallThings
...
Someone called for pest control?
2015-04-04 20:58:07 +11:00
8d2f92cdd3
Merge pull request #8683 from AnturK/pickets
...
Adds Picket Signs
2015-04-04 20:57:56 +11:00
20ed6aada5
Merge pull request #8668 from ACCount12/syndieboxes
...
Toolboxes & welders update
2015-04-04 20:57:15 +11:00
09c102cf9a
Update stunbaton.dm
2015-04-04 16:09:15 +13:00
de16628204
stun batons no longer lose charge over time
2015-04-04 16:06:59 +13:00
493c3e038a
Splitting food.dmi into smaller files.
...
Repathing meat slab, meatsteaks and cutlets into meat/slab, meat/steak, meat/rawcutlet, meat/cutlet. Fixes issue with food naming when containing meat stuff, especially human meat.
Bowl filled with reagent now gets a nice half transparent overlay with the reagents colors (like beaker)
Mousedroping a snack that's on a table now opens the tablecrafting window.
Fixes not being to store items in plain bread, plain cake and cheesewheel.
2015-04-03 21:59:56 +02:00
2e4a8fcce8
Recieve --> receive grammarfix
...
Changes all "recieve"s in descriptions around the tgstation to "receive". Also energy katana description high priority fix.
Fixes #8576
Fixes #8504
2015-04-03 19:42:34 +03:00
cd3f2516e0
Update PDA.dm
...
i fucked up
2015-04-02 16:42:14 -04:00
fcd5938545
Merge branch 'master' of https://github.com/tgstation/-tg-station into sadclown
2015-04-02 16:30:08 -04:00
4377cd6536
Merge branch 'master' into stealthy_weapons
2015-04-02 16:10:37 -04:00
3ff5980e85
- Adds Picket Signs
2015-04-02 18:23:17 +02:00
6cba1d829c
a buhhhhhh buhhhhhhhhhh
2015-04-02 10:21:06 -04:00
57e1274353
Merge pull request #8624 from Cheridan/day42_betsoff
...
Day Who-Knows: Bar Gambling Expansion!
2015-04-02 20:15:18 +11:00
cda61c1075
Welder&toolboxes update
2015-04-01 10:43:22 +12:00
a2dfdc8f7b
sad trombone for clown pda
2015-03-31 14:13:48 -04:00
Cheridan
xxalpha
phil235
phil235
GunHog
oranges
AnturK
Jordie0608
Sawu
Xhuis
norill
blah
Zelacks
CosmicScientist
Orange Borg
Remie Richards
kingofkosmos
danno "big fucking moron" gonzales
Artur
ACCount12