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
b7f878d047
gun cases
2015-03-11 21:30:07 -04:00
3bf0c7015a
Replace some object verbs with alt-clicking
2015-03-10 21:28:13 -04:00
1b1ee50b00
ASS BLAST USA USA USA USA
2015-03-09 17:50:37 -04:00
751fb4aaa9
Adds SLOT_BACK for energy katana, makes energy katana call emag_act() on what it strikes (mirroring energy/blade functionality cleanly), Removes energy/blade hacks.
2015-03-09 21:48:45 +00:00
79a20bd57b
slight fix
2015-03-09 19:19:17 +01:00
71d560bd3a
Fixes a runtime with buckling screen alert
...
Fixes being able to buckle to janicart while crit and when there's a dense object on the janicart's turf.
Fixes alien nest not buckling and being wrongly pixel shifted, and fixed a runtime.
Fixes golems being super easy to weaken by punch and not doing more damage themselves via punch.
Fixes some typos.
2015-03-09 19:09:52 +01:00
1cb7674ebd
Adds a cheap looking pulse animation for magic mirrors so wizards notice they are actually more than normal mirrors
...
Adds a changelog
2015-03-09 12:42:41 -04:00
f4734de342
Merge pull request #8162 from Jordie0608/thisdrillwillnotpiercetheheavensbecauseithasbroken
...
Fixes #8148 , Improves drill's handling of power
2015-03-08 23:41:50 -05:00
9384d44ee5
Adds a magic mirror to the wizards shuttle. The magic mirror has greatly expanded functionality compared to the normal one, and can additionally change a wizards name, gender, race, hair color and eye color.
...
Additionally this fixes up some rogue simulated airless tiles on the wizards shuttle (these tiles were why the creature would always end up dead)
2015-03-08 04:24:04 -04:00
7488c47e7a
Merge pull request #8102 from Mandurrrh/tableclimbnerf
...
Balancing out tableclimbing.
2015-03-07 21:39:37 +00:00
377dd9f876
Merge pull request #8142 from phil235/girderfixes
...
Fixes many checks in construction from stacks,
2015-03-06 13:54:09 -06:00
68c791ee7c
Merge pull request #7751 from RemieRichards/ProceduralGeneration
...
Procedural Map Generator System
2015-03-06 11:49:21 -08:00
0496dcd446
Merge pull request #8169 from dannno/morebarsigns
...
adds more barsigns
2015-03-06 13:35:13 -06:00
13e291a4e9
Merge remote-tracking branch 'upstream/master' into catwalkmachines
...
Conflicts:
code/game/turfs/turf.dm
code/modules/power/power.dm
2015-03-06 19:19:09 +00:00
9cf4a0bfc6
Merge pull request #8114 from phil235/CookTrash
...
Cooking fixes for meat and trash
2015-03-05 23:54:29 -06:00
354f59f10c
adds more barsigns
2015-03-05 14:06:44 -05:00
1c55a568f2
Merge pull request #8075 from Xhuis/the_coderbus
...
Adds the Coderbus and Adminbus bar signs: No merge conflicts edition
2015-03-05 13:08:33 -05:00
a7e23d672a
Improves drill's handling of power
2015-03-05 17:12:12 +11:00
f5279273f1
Fixes many checks in construction from stacks, so you can no longer build two girders on top of each other for example.
2015-03-03 23:43:17 +01:00
467e102b49
Fixes trash disappearing when washed in a sink.
...
Fixes waffle trash being named "waffles".
Replacing some stat/weakened/stunned checks with incapacitated()
Fixes meat cutlets and steak not including meat type in their name (e.g. raw corgi meat cutlet)
Harvesting meat from simple animals now takes time, has a sound, and can be done with any sharp item.
2015-03-03 00:07:08 +01:00
2ec53ea6c7
Adds the second block for table climbing before the first return.
2015-03-02 16:53:15 -05:00
24dcf08b2e
Merge branch 'master' of https://github.com/tgstation/-tg-station into alert_alert_ur_a_faget
...
Conflicts:
code/modules/mob/living/carbon/alien/humanoid/life.dm
code/modules/mob/living/carbon/alien/larva/life.dm
code/modules/mob/living/carbon/alien/life.dm
code/modules/mob/living/carbon/monkey/life.dm
icons/mob/screen_alien.dmi
2015-03-02 12:04:38 -08:00
d2d0888432
Merge pull request #7726 from xxalpha/traymesons
...
Mesons+T-Ray = Engineering Goggles
2015-03-02 19:24:06 +01:00
43f1fc3fd6
Adds appropriate message for user and nearby mobs for being knocked off table. Also uses weaken instead of stun to physically knock the player over.
2015-03-02 08:07:52 -05:00
9f62e2c387
Merge pull request #8055 from xxalpha/xxmas
...
Removes Santa Hats from security wardrobe closets and the festivus pole from RD's office.
2015-03-01 20:04:52 -06:00
Jordie
Incoming
MrPerson
phil235
xxalpha
Swag McYolosteinen
dannno
Cheridan
pudl
Cheridan
MMMiracles
Xhuis
Remie Richards
hornygranny
WJohn
phil235
Mandurrrh