506da51f96
Merge pull request #8455 from Incoming5643/how_bout_I_get_you_some_stones
...
Adds click delay to smacking up statues
2015-03-23 16:31:53 -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
beacf0cf4a
Merge pull request #8349 from MrPerson/qdel_reagents_hopefully
...
Fix reagent garbage collection hopefully
2015-03-23 08:55:11 -05: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
53e40ec315
Merge pull request #8427 from Cheridan/day3_collars
...
Event Day 3 - Pet Collars!
2015-03-22 19:37:12 +01: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
9486248553
Merge pull request #8440 from dannno/coperite
...
GAR GLASSES
2015-03-22 12:05:21 -05:00
973f374276
Fixed the C4 being planted on the DA.
2015-03-22 16:26:58 +00:00
434265afa0
Reagent Decals 2: Black Powder Boogaloo
2015-03-22 02:04:31 -07:00
2fa6457130
Added a preference toggle for hearing musical instruments
2015-03-22 01:54:30 -07:00
9229f72573
Fix up certain chemicals to not overwrite Del(). Meh.
...
Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_reagents_hopefully
Conflicts:
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents.dm
2015-03-21 23:04:53 -07: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
d361649df5
Merge pull request #8369 from pudl/retardfix
...
normal sec headset
2015-03-21 17:23:18 +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
5861b643b6
Adds click delay to smacking up statues. Fixes #8313
2015-03-20 23:50:25 -04: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
c25576ad6a
Merge remote-tracking branch 'upstream/master' into catwalkmachines
...
Conflicts:
code/game/objects/structures/lattice.dm
2015-03-20 17:02:00 +00: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
7d17c54555
Merge pull request #8411 from xxalpha/cablefix
...
Fixes cables being destroyed when creating plating out of catwalk space.
2015-03-20 17:45:36 +01:00
d95209a5df
Merge pull request #8391 from Incoming5643/Statue_of_limitations
...
Fixes invincible unstoppable death statues
2015-03-20 17:43:22 +01:00
29477dfccc
adds GAR glasses of various flavors
...
you're welcome
2015-03-20 01:29:54 -04: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
88e3bb1dc6
generalized procs for gun lockers
2015-03-19 16:23:06 -04: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
9551919970
Merge pull request #8395 from xxalpha/jetpacktrail
...
Fixes the jetpack trail animation.
2015-03-19 16:44:37 +11:00
e5fdddc7d8
Merge pull request #8289 from Xhuis/alt_clicking
...
Allows alt-clicking for some stuff
2015-03-19 16:43:53 +11:00
a66018cb4b
Adds collar to HoP closet
2015-03-19 00:18:56 -05: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
7149f0382d
Adds Pet Collars!
...
Map needs update now
2015-03-18 21:27:21 -05:00
06b7bdb3e3
adds guncases that really work wooooooooooo hahahaaaaaaaaaa
2015-03-18 19:08:39 -04:00
790bdd90b0
Fixes cables being destroyed when creating plating out of catwalk space.
2015-03-18 19:17:04 +00:00
1873143e63
Initial say cleanup commit.
2015-03-18 19:23:31 +01:00
edccabb0c4
Only engineering type hardsuits have the inbuilt jetpack.
2015-03-18 17:48:45 +00:00
50e4b1a024
Fixes jetpack trail animation.
...
Fixes jetpack trail animation 2.
2015-03-17 21:22:47 +00:00
8fa8919e2e
Added a comment, removed unnecessary line.
2015-03-17 19:41:58 +00:00
6f5ea7f5e7
Adds embedded jetpacks to hardsuits.
2015-03-17 18:42:29 +00:00
612ededfd0
Removes factions from sentient mobs, as they both don't need them being player contr and it leads to some really exotic bugs.
...
Fixes an unreported bug where statues could bleed out
2015-03-17 14:26:05 -04: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
hornygranny
phil235
Cheridan
dannno
Swag McYolosteinen
Nienhaus
xxalpha
Iamgoofball
MrPerson
Xhuis
Fayrik
Razharas
Jordie
Remie Richards
Incoming
AnturK
Zelacks
Cheridan