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
3bb6cc8af9
Merge pull request #8625 from xxalpha/cyberplus
...
Cyber Implants +
2015-04-04 20:57:48 +11:00
7ec043a542
Added medical hud implant to CMO locker. Added chest implant sprites.
2015-04-04 00:56:06 +01:00
862657bd7c
Merge pull request #8421 from dannno/guncases
...
gun lockers
2015-04-03 18:40:40 +01:00
1f94f2fe27
Update guncase.dm
...
change 4 to capacity
2015-04-03 13:19:45 -04:00
8de848eccb
Update guncase.dm
2015-04-03 13:16:25 -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
4051efc3a9
Proper UI for gun lockers
2015-03-31 12:54:24 -04:00
005c519b94
Merge pull request #8622 from phil235/TableclimbKnockFix
...
Fixes tableclimber knocking themself off the table when clicking it mid-climb
2015-03-31 22:06:51 +11:00
f10d0df8cf
Merge remote-tracking branch 'origin/master' into mining
2015-03-31 18:31:12 +12:00
67d9f77ea9
Merge pull request #8600 from phil235/AlienNestFixing
...
Fixes alien nest buckling
2015-03-31 00:06:14 -05:00
12a729adcd
Fixes many instances of lying mob getting shifted up (pixel_y reset to 0) by adding a lying_pixel_offset var to mob/living.
...
Removes the delay when toggling resting, sleeping and pouncing, the mob sprite will now update instantly.
2015-03-30 23:14:21 +02:00
884e9e3774
Day Who-Knows: Bar Gambling Expansion!
...
Space cash is stacks
Adds dealer table to map
2015-03-29 18:09:54 -05:00
0745219d06
Fixes tableclimber knocking themself off the table when clicking it mid-climb.
2015-03-29 23:57:47 +02:00
2ef01a61c5
Fixes alien nest not blocking the victim from instantly unbuckling. The victim now needs to click the nest or resist, then wait 2 minutes before being free.
...
Fixes alien nest buckling pixel offset.
Removes resist unbuckling 'success' message so there's not two unbuckling messages.
Fixes objects with buckling not unbuckling its buckled mob when the mob is gibbed (Fixes alien nest overlay not disappearing when larva burst and gib its host).
2015-03-28 23:02:44 +01:00
e80a50f1c7
Fixes not being able to put unlit welding tool in open closets and not being able to open a closet with an unlit welding tool in your hand.
2015-03-28 00:12:06 +01: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
69924a15be
plasma/ripley update
2015-03-25 18:06:26 -05:00
d45b0aa656
improved gun case code
2015-03-25 12:01:06 -04:00
fde0eecce8
Merge pull request #8456 from MrPerson/im_the_music_meisteeeeeeeeeeeeeer
...
Instrument tweaks
2015-03-25 16:29:29 +11:00
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
53e40ec315
Merge pull request #8427 from Cheridan/day3_collars
...
Event Day 3 - Pet Collars!
2015-03-22 19:37:12 +01:00
9486248553
Merge pull request #8440 from dannno/coperite
...
GAR GLASSES
2015-03-22 12:05:21 -05:00
2fa6457130
Added a preference toggle for hearing musical instruments
2015-03-22 01:54:30 -07:00
d361649df5
Merge pull request #8369 from pudl/retardfix
...
normal sec headset
2015-03-21 17:23:18 +11: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
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
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
88e3bb1dc6
generalized procs for gun lockers
2015-03-19 16:23:06 -04: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
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
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
485231c7f8
security officers once again have the choice of a normal headset
2015-03-15 23:32:54 -05:00
cb07696814
Merge pull request #8319 from MMMiracles/bearpelts4everyone
...
Ability to put bears on meat spikes.
2015-03-15 02:34:07 -05:00
da1e6f57f0
Merge pull request #8334 from MrPerson/cleanup_crew_comin_through
...
Code cleanup
2015-03-15 01:55:39 -05:00
456a64f8fd
slime from carbon to simple animal
2015-03-14 23:40:57 +01:00
f552aa0ce1
Merge pull request #8222 from Incoming5643/I_dont_even_know_who_I_am_anymore
...
Magic Mania 1.855: Appearances are everything
2015-03-13 23:01:34 -05:00
e5428c1519
Merge pull request #8256 from phil235/StrangenessTextFix
...
Strangeness text, janicart, alien nest, weak golem fixes
2015-03-13 15:23:30 -05:00
9038fb15af
Code cleanup
...
Removed a bunch of unused or hardly used vars on /mob and /atom/movable.
Added defines for mob/living/var/mob_size so it's not using magic numbers.
2015-03-13 10:41:00 -07:00
28f6aae00c
Merge branch 'NinjaCleanup' of git://github.com/RemieRichards/-tg-station into RemieRichards-NinjaCleanup
...
Conflicts:
icons/mob/back.dmi
remie is a nerd btw
2015-03-12 20:47:11 -05:00
93425742e5
bop
2015-03-12 20:00:10 -04:00
8092764332
Adds the ability to spike bears on the meatspike for their pelt, as well as yield 5 meat instead of 3. Less messy, more efficient.
2015-03-12 19:50:23 -04:00
phil235
Jordie
xxalpha
Remie Richards
danno "big fucking moron" gonzales
ACCount12
Cheridan
Cheridan
pudl
hornygranny
Swag McYolosteinen
Nienhaus
MrPerson
Incoming
MMMiracles