cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-22 06:56:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,489 Commits 61 Branches 14 Tags
6ba41ca7a79b1b39c8efafa3f7b559ef215b67cf
Commit Graph

1204 Commits

Author SHA1 Message Date
kingofkosmos
6ba41ca7a7 Do_afters now use "target = src", removed oldloc-stuff. 
False wall construction had a bug if you had exactly 2 sheets in your hand, it wouldn't work - fixed it.
 2015-04-14 19:45:08 +03:00
kingofkosmos
68e0f06278 "var oldloc"s -> "var/oldloc" 
Fixed the unsecured girder sliding below vents and scrubbers by placing it on layer 2.45.
 2015-04-05 17:56:41 +03:00
kingofkosmos
540e525e25 MADE FALSE WALL CONSTRUCTION TAKE SOME TIME (but only half the time of normal construction steps since it's not airtight and such). 
Replaced numbered states with the GIRDER_stuff.

Fixed some grammar stuff.

Made reinforced girder deconstruction give the plasteel back when deconstructed.
 2015-04-05 14:00:02 +03:00
kingofkosmos
47fb65ca1f Removed the extra 4. Plasma cutting now produces 2 metals per girder. 2015-04-04 22:10:25 +03:00
kingofkosmos
052635da72 Changed to only user's fingerprints get to the new metal after disassembly. 2015-04-04 21:42:40 +03:00
kingofkosmos
e19ca2841d Girder disassembly changes 
Current situation:
Wrench to girder (unsecured) -> secure girder
Wrench to girder (secured) -> disassemble girder
Crowbar to girder (secured) -> unsecure girder

This PR changes it to:
Wrench to girder (unsecured) -> secure girder (same as before)
Wrench to girder (secured) -> unsecure girder
Welder to girder (unsecured) -> disassemble girder

This is more consistent with nearly every other frame in the game, which have to be first unsecured with a wrench and then disassembled with a welder.
 2015-04-04 12:03:26 +03:00
Jordie
57e1274353 Merge pull request #8624 from Cheridan/day42_betsoff 
Day Who-Knows: Bar Gambling Expansion!
 2015-04-02 20:15:18 +11:00
Jordie
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
ACCount12
f10d0df8cf Merge remote-tracking branch 'origin/master' into mining 2015-03-31 18:31:12 +12:00
Cheridan
67d9f77ea9 Merge pull request #8600 from phil235/AlienNestFixing 
Fixes alien nest buckling
 2015-03-31 00:06:14 -05:00
Cheridan
884e9e3774 Day Who-Knows: Bar Gambling Expansion! 
Space cash is stacks
Adds dealer table to map
 2015-03-29 18:09:54 -05:00
phil235
0745219d06 Fixes tableclimber knocking themself off the table when clicking it mid-climb. 2015-03-29 23:57:47 +02:00
phil235
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
phil235
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
phil235
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
pudl
69924a15be plasma/ripley update 2015-03-25 18:06:26 -05:00
Jordie
fde0eecce8 Merge pull request #8456 from MrPerson/im_the_music_meisteeeeeeeeeeeeeer 
Instrument tweaks
 2015-03-25 16:29:29 +11:00
hornygranny
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
phil235
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
Swag McYolosteinen
53e40ec315 Merge pull request #8427 from Cheridan/day3_collars 
Event Day 3 - Pet Collars!
 2015-03-22 19:37:12 +01:00
Nienhaus
9486248553 Merge pull request #8440 from dannno/coperite 
GAR GLASSES
 2015-03-22 12:05:21 -05:00
MrPerson
2fa6457130 Added a preference toggle for hearing musical instruments 2015-03-22 01:54:30 -07:00
Jordie
d361649df5 Merge pull request #8369 from pudl/retardfix 
normal sec headset
 2015-03-21 17:23:18 +11:00
Incoming
5861b643b6 Adds click delay to smacking up statues. Fixes #8313 2015-03-20 23:50:25 -04:00
MrPerson
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
phil235
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
xxalpha
c25576ad6a Merge remote-tracking branch 'upstream/master' into catwalkmachines 
Conflicts:
	code/game/objects/structures/lattice.dm
 2015-03-20 17:02:00 +00:00
Swag McYolosteinen
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
Swag McYolosteinen
d95209a5df Merge pull request #8391 from Incoming5643/Statue_of_limitations 
Fixes invincible unstoppable death statues
 2015-03-20 17:43:22 +01:00
dannno
29477dfccc adds GAR glasses of various flavors 
you're welcome
 2015-03-20 01:29:54 -04:00
Jordie
e5fdddc7d8 Merge pull request #8289 from Xhuis/alt_clicking 
Allows alt-clicking for some stuff
 2015-03-19 16:43:53 +11:00
Cheridan
a66018cb4b Adds collar to HoP closet 2015-03-19 00:18:56 -05:00
Cheridan
7149f0382d Adds Pet Collars! 
Map needs update now
 2015-03-18 21:27:21 -05:00
xxalpha
790bdd90b0 Fixes cables being destroyed when creating plating out of catwalk space. 2015-03-18 19:17:04 +00:00
Incoming
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
pudl
485231c7f8 security officers once again have the choice of a normal headset 2015-03-15 23:32:54 -05:00
Cheridan
cb07696814 Merge pull request #8319 from MMMiracles/bearpelts4everyone 
Ability to put bears on meat spikes.
 2015-03-15 02:34:07 -05:00
Cheridan
da1e6f57f0 Merge pull request #8334 from MrPerson/cleanup_crew_comin_through 
Code cleanup
 2015-03-15 01:55:39 -05:00
phil235
456a64f8fd slime from carbon to simple animal 2015-03-14 23:40:57 +01:00
Cheridan
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
Cheridan
e5428c1519 Merge pull request #8256 from phil235/StrangenessTextFix 
Strangeness text, janicart, alien nest, weak golem fixes
 2015-03-13 15:23:30 -05:00
MrPerson
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
Cheridan
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
MMMiracles
93425742e5 bop 2015-03-12 20:00:10 -04:00
MMMiracles
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
Xhuis
3bf0c7015a Replace some object verbs with alt-clicking 2015-03-10 21:28:13 -04:00
MMMiracles
1b1ee50b00 ASS BLAST USA USA USA USA 2015-03-09 17:50:37 -04:00
Remie Richards
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
phil235
79a20bd57b slight fix 2015-03-09 19:19:17 +01:00
phil235
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