d209ce5235
Merge remote-tracking branch 'remotes/upstream/master' into stealthy_weapons
2015-03-28 14:42:31 -04:00
2c988e0aea
Adds pizza bomb traitor item
2015-03-28 12:45:05 -04:00
cb23548768
Merge pull request #8533 from Jordie0608/greatpermitsbringgreatweightresponsibility
...
Fixes #8527 , construction permit weight
2015-03-27 14:04:38 -05:00
17067d9021
Merge pull request #8508 from phil235/SlimeAnimal
...
Life refactor and slime as animal
2015-03-27 13:38:16 -05:00
a86b757d93
Merge pull request #8291 from Xhuis/nerf_thermal_vision
...
Nerfs changeling augmented eyesight
2015-03-26 13:01:25 +11:00
1b3eb49a1d
Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal
...
Conflicts:
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/slime/slime.dm
code/modules/mob/living/simple_animal/slime/say.dm
2015-03-26 02:31:06 +01:00
e92fe6c333
Merge pull request #8495 from dannno/hahaobjectionxd
...
adds hammer and gavel
2015-03-25 16:13:39 -07:00
461ea87bdc
construction permit's w_class to 1
2015-03-25 16:52:09 +11:00
0e57fc6941
Merge pull request #8488 from Miauw62/whatsthedifferenceanyway
...
Adds a verb_exclaim var. Fixes #8478 .
2015-03-25 16:31:16 +11:00
ff90e1599c
Merge pull request #8320 from AnturK/headcrabs
...
Adds Headcrabs!
2015-03-25 16:31:00 +11:00
9a217503aa
Merge pull request #8451 from Fayrik/FoamForceFuckYeah
...
Foam force fuck yeah!
2015-03-25 16:30:42 +11:00
fde0eecce8
Merge pull request #8456 from MrPerson/im_the_music_meisteeeeeeeeeeeeeer
...
Instrument tweaks
2015-03-25 16:29:29 +11:00
0cbcda509d
Merge pull request #8448 from AnturK/gothisway
...
Adds arrow graffiti
2015-03-25 16:29:15 +11:00
a37ac1d600
warning span for gavel
2015-03-24 22:53:11 -04:00
eadfecd552
- Makes body_egg parent for alien embryos/changeling eggs
2015-03-24 17:54:20 +01:00
59af7cfd42
Merge pull request #8323 from Mandurrrh/miningborgupgrade
...
Adds a cyborg upgrade module for the satchel of holding.
2015-03-24 16:40:52 +11:00
b73dd39854
Merge pull request #8436 from phil235/VendMachineCoinItemsFix
...
Fixes vending machines starting with no coin or hacked items.
2015-03-23 16:33:26 -07:00
ffd711c26f
Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal
...
Conflicts:
code/modules/mob/living/carbon/life.dm
code/modules/mob/living/carbon/slime/slime.dm
code/modules/mob/living/simple_animal/friendly/corgi.dm
code/modules/mob/living/simple_animal/slime/say.dm
code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
2015-03-23 16:51:03 +01:00
365c36c1e0
repair gavel syntax
2015-03-22 20:36:10 -04:00
3254142b21
adds hammer and gavel
2015-03-22 20:22:27 -04:00
ba2a1c8f19
Adds a verb_exclaim var. Fixes #8478 .
...
Also makes saymods transmitted through the radio system for upcoming NTSL integration.
2015-03-22 18:55:59 +01:00
7f6871c233
Fixes conflicts and commits
2015-03-21 12:47:25 -04:00
0173c7af6e
Adds everything and makes it all work perfectly. It's like I'm almost good at this or something. (Seriously, points of interest: Secbots react to being shot. Dart rigging. Donksoft guns.)
2015-03-21 16:18:32 +00:00
2271499db7
Merge pull request #8058 from Iamgoofball/explosive
...
GOONCHEM 5: Pyrotechnics are finished, Toxins mostly complete
2015-03-21 09:54:11 +03:00
5d1155e09e
Merge pull request #8435 from Zelacks/ChemImplantGuiFix
...
Chemical implant action button fix
2015-03-21 17:25:08 +11:00
819422bc3e
Merge pull request #8410 from Miauw62/yesgunhogimrewritinggoofsay
...
MIAUW VON SAYCODE 3: RISE OF THE SPANS
2015-03-21 05:05:37 +00:00
fa7a89b25b
Instrument tweaks
...
The piano will stop playing once you walk away from it or get stunned.
The song BPM of the piano and violin will generally speaking be wrong because of discrepancies between the sleep between notes and world.tick_lag. I've solved this by locking BPM to points where the stated BPM will actually be the case because tempo == world.tick_lag.
Example
Current:
song @ 5 tempo - 120 BPM: c, c/2, c -> note -> sleep(5) -> 6 ticks (5.4 time passes) -> note -> sleep(2.5) -> 3 ticks (2.7 time passes) -> note.
With this PR:
song @ 5.4 tempo - 111 BPM: c, c/2, c -> note -> sleep(5.4) -> 6 ticks (5.4 time passes) -> note/2 -> sleep(2.7) -> 3 ticks (2.7 time passes) -> note.
I was hoping this would make the damn things sound better but then I realized it wasn't actually messing anything up. Oh well.
2015-03-20 20:40:36 -07:00
b758992e8c
First (of probably several) commits to add Foam Force toy guns. Adds the new guns and crossbow, removes the old crossbow, and makes these new guns available to cargo.
2015-03-20 23:02:53 +00:00
97ed18abfa
- Adds arrow graffiti
2015-03-20 19:41:59 +01:00
aecb365f84
Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal
...
Conflicts:
code/modules/mob/living/carbon/alien/life.dm
code/modules/mob/living/carbon/life.dm
code/modules/mob/living/carbon/slime/slime.dm
code/modules/mob/living/silicon/robot/life.dm
code/modules/mob/living/simple_animal/slime/life.dm
2015-03-20 19:32:16 +01:00
9e25fe4019
Merge pull request #8431 from AnturK/lawsupdated
...
Adds total law changes counter
2015-03-20 17:46:44 +01:00
57aadcc7fb
Merge pull request #8424 from phil235/SiliconWeldProtFix
...
Fixes silicons being flashed when welding.
2015-03-20 17:46:16 +01:00
17fe2ae3f2
Fixes vending machines starting with no coin or hacked items. Now those items also use the resupply canister charges, but they are the last ones to be resupplied.
...
Fixes the amount of charges per resupply canister so all vending machines starts fully loaded.
2015-03-20 00:28:44 +01:00
8e2850f832
The action button should be correctly handled in chem implants by injecting all the reagents if the action buttion is the cause
2015-03-20 03:58:58 +08:00
7cccf20fc0
Adds total law changes counter
2015-03-19 14:57:12 +01:00
b7adce753a
Fixes unreported bug with clf3, changes the brainloss in heart attack to do 1 brute instead of 10 brain, makes health scanners show heart attacks.
2015-03-18 20:33:03 -07:00
c9312a6ab7
Fixes silicons being flashed when welding. Silicons and repair drones now have eye protection like aliens. This means flashers and flashbangs no longer flash them, but flashbang still weaken them, and lasers and handheld flashes still work on them.
2015-03-19 04:04:44 +01:00
1873143e63
Initial say cleanup commit.
2015-03-18 19:23:31 +01:00
cb9d49ab02
Merge pull request #8359 from xxalpha/stackfix
...
Fixes several zero amount stack bugs.
2015-03-17 17:10:04 +11:00
0850fc626e
Merge pull request #8358 from CandyClownTG/patch-1
...
Update fancy.dm
2015-03-17 17:09:37 +11:00
7600697c13
Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive
2015-03-16 21:13:56 -07:00
9c148ff13e
Merge pull request #8315 from phil235/BigUserdanger
...
Makes the message when you're attacked slightly bigger
2015-03-16 18:30:21 +11:00
d7f29d770c
Merge pull request #8113 from Xhuis/boom_boom_shake_the_room
...
Restores gibbing for suicide C4
2015-03-15 22:50:12 +01:00
c9d600e653
Fixes stack duping.
2015-03-15 19:04:07 +00:00
78d28a6d64
Merge branch 'master' of https://github.com/tgstation/-tg-station into BigUserdanger
...
Conflicts:
code/modules/events/ninja.dm
2015-03-15 12:30:27 +01:00
da1e6f57f0
Merge pull request #8334 from MrPerson/cleanup_crew_comin_through
...
Code cleanup
2015-03-15 01:55:39 -05:00
d0f101cd37
Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive
...
Conflicts:
code/modules/reagents/Chemistry-Recipes.dm
2015-03-14 21:32:13 -07:00
33ffd33180
fixes and tweaks
2015-03-14 21:13:23 -07:00
0b7be73f62
Merge pull request #8286 from phil235/SteelcapFix
...
Steel cap, sandstone and welding fixes plus flashing refactor
2015-03-14 22:56:37 -05:00
7114d5ac04
Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
code/modules/reagents/Chemistry-Goon-Medicine.dm
2015-03-14 20:00:35 -07:00
Xhuis
Cheridan
Jordie
phil235
hornygranny
dannno
AnturK
Miauw
Fayrik
Razharas
Remie Richards
MrPerson
Zelacks
Iamgoofball
phil235
xxalpha