cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-19 05:26:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,049 Commits 61 Branches 14 Tags
28b1d8bef04eb554b6cd4885547be899e9ccf57f
Commit Graph

753 Commits

Author SHA1 Message Date
paprka
28b1d8bef0 fixes grille rebuilding, removes damaging from tables, adds better sound effects for smashing tables, adds chance to fail breaking reinforced tables as hulk 2014-11-03 20:41:40 -08:00
paprka
5720b29130 final commit for now for glass tables 2014-11-03 19:26:33 -08:00
paprka
f268f3d357 Merge branch 'master' of https://github.com/tgstation/-tg-station into glasstables 2014-11-03 18:31:43 -08:00
Cheridan
df13b0d840 Merge pull request #5591 from hornygranny/OOPgularity3 
improved deconstruction, singularity stuff
 2014-11-03 20:20:55 -06:00
hornygranny
d5b8ed3155 Merge pull request #5460 from paprka/rdturtle 
Adds RD turtleneck and updates whimsy
 2014-11-03 18:18:18 -08:00
paprka
1b6eb8afec Merge branch 'master' of https://github.com/tgstation/-tg-station into defibsfinal 
Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
 2014-11-03 17:57:40 -08:00
hornygranny
7e4688e3f6 Merge pull request #5427 from paprka/littlejanitorthings 
Soap, lube, and janitor tweaks
 2014-11-03 17:19:37 -08:00
hornygranny
fa4fa09149 Merge pull request #5569 from Menshin/runtimes_roundsup 
Alek2ander weekly runtimes fixing
 2014-11-03 17:13:18 -08:00
hornygranny
85016d7f38 Merge pull request #5493 from tkdrg/pullingyourleg 
Makes pull into a mob verb
 2014-11-03 17:10:34 -08:00
Hornygranny
4cfa4ec04b windows break at stage 5 2014-11-03 11:37:08 -08:00
Cheridan
a28abaf72a Merge pull request #5544 from MrPerson/jesus_shut_up_aran_god_damn 
Make buckled mobs anchored if their chair is anchored
 2014-11-02 22:40:20 -06:00
paprka
1288c7da81 cleaned up procs, added glass table smashing 2014-11-02 16:53:15 -08:00
paprka
ffd02c45c2 second commit for table redoing 2014-11-02 10:52:25 -08:00
Cheridan
6e29ad75d5 Merge pull request #5492 from tkdrg/nofunallowed 
You can no longer put transit tube pods in a station that already has one
 2014-11-02 11:56:20 -06:00
tkdrg
7ebc4bb742 Merge remote-tracking branch 'upstream/master' into pullingyourleg 
Conflicts:
	code/modules/mob/mob.dm
 2014-11-02 14:40:37 -03:00
MrPerson
05b2146a7d Fix anchored issues with alien nests 
Because standardization is poison it seems
Also fix an issue where pixel_y could get permanently set to 6.
 2014-11-02 05:46:03 -08:00
paprka
85de5f7cd5 initial commit for table overhaul 2014-11-01 23:57:01 -07:00
Menshin
8202bde945 Even the damned statue !!! 2014-11-01 22:06:59 +01:00
phil235
128c9222e5 Adding checks for stun, restrained to many object verbs. 
Fixing paper and supply manifest description upon examination.
Fixing being able to adjust jumpsuit while restrained.
Fixing one typo.
 2014-11-01 19:18:01 +01:00
Hornygranny
5815d7e011 grilles are now damaged by thrown items 
disposalpipes deconstruction
atmos pipes deconstruction
 2014-10-31 18:26:42 -07:00
paprka
393dcaade7 changes scrub spawn to one of each instead of RNG 2014-10-30 20:28:26 -07:00
Menshin
6176ee9f0f conflicts fixing 2014-10-31 02:43:00 +01:00
Menshin
cce46b39eb Fixes runtimes related to clown_ore -> bananium changes (fixes #5554). 
Fixes runtimes related to security records (fixes #5552).
Changing the name in the security database now also change it in the general database.
 2014-10-31 02:30:34 +01:00
paprka
920739c8ab defibrillators initial commit 2014-10-30 14:53:51 -07:00
MrPerson
d14d5ac6a1 Make buckled mobs anchored if their chair is anchored 2014-10-29 22:56:11 -07:00
MrPerson
e9f6e5d17d Added a changelog entry 
Also fixed the chair-diagonal drifting bug somehow
 2014-10-28 07:37:31 -07:00
paprka
7c9b23024a readds holosign to janicloset by default 2014-10-27 11:55:33 -07:00
tkdrg
b0db18234f Makes pull into a mob verb. 2014-10-27 12:28:06 -03:00
tkdrg
0a47c8ec4e You can no longer put transit tube pods in a station that already has one. 2014-10-27 11:55:46 -03:00
paprka
3b24ac8fa9 removes useless spawn 2014-10-26 14:35:27 -07:00
paprka
873c3f41e2 Merge branch 'master' of https://github.com/tgstation/-tg-station into rdturtle 
Conflicts:
	icons/mob/uniform.dmi
 2014-10-26 00:30:44 -07:00
MrPerson
2c8adffac3 Merge branch 'master' of https://github.com/tgstation/-tg-station into space_movement_jam 
Conflicts:
	code/modules/mob/living/living.dm
 2014-10-25 23:25:27 -07:00
MrPerson
ef6204656f Space movement rewrite to allow everything to drift 
Removes a version of atom/movable/Move() that was in mob_movement.dm.
New proc called newtonian_move() that's called as a result of things like shooting a gun or spraying a fire extinguisher and as part of atom/movable/Move().
It pushes src if it's not under gravity and gives the object a chance to stop itself.
As a result, inertial_drift() is kill.
Moved Process_Spacemove() out to atom/movable. It does the same thing, it's called whenever a drift is attempted and stops the drift if it returns 1. Default check is to look for nearby lattices to make dragging shit around the station less annoying. Mobs still call it in Client/Move()
The mob version of Process_Spacemove() will shove non-anchored nearby objects out of the way if you try to move like that. For example if you're free-floating in space next to a closet and try to move right, the closet will drift off to the left.
Mechs call their occupant's version of Process_Spacemove() so mining with a mech isn't retarded. The pussy wagon does the same thing and thus no longer works like a jetpack. Will it be making a comeback?!?! (no)
Any move will attempt to keep dragging your pulled object, not just ones initiated by the client. Should make space wind a little less annoying. Was needed to make drifting not break your drags.
Mechs drift correctly without any special snowflake crap.
Spaceslipping is gone because fuck that shit
Space movement is now slow instead of fast. Having a jetpack helps go faster but even that's slower than current. Hopefully means nuke ops can see each other as they move to the station instead of losing sight of each other instantly. Having your hands full makes spacemovement even slower.
You can drift in office chairs and drag mobs in beds or the bed itself. Currently drifting diagonally while in an office chair is bugged and I need help to solve it. It winds up in cardinal movement instead of a diagonal one.
Changes up the jetpacking effects system to cause fewer errant ion trails but it's still awful code. In hindsight I shouldn't have bothered but here we go.
 2014-10-25 23:19:46 -07:00
paprka
1f3c2ee85c readds RD updated krieger jumpsuit and updates turtleneck 2014-10-25 19:24:40 -07:00
paprka
458f455340 adds RD turtleneck to replace whimsy 2014-10-25 15:02:21 -07:00
paprka
51a4bd7be6 drill sergeant hat for HoS instead of police 2014-10-25 13:51:36 -07:00
paprka
9cc31a3b85 adds HoS black police hat, and other changes 2014-10-24 04:19:11 -07:00
paprka
b136cf653c wet floor signs and advanced janitor research 2014-10-23 13:43:42 -07:00
paprka
7f2feabbd8 soap, lube, and janitor stuff 2014-10-23 01:44:19 -07:00
hornygranny
3a98979572 Merge pull request #5393 from paprka/cooljackets 
Adds bomber and leather jackets + toolbelt improvements
 2014-10-22 16:43:42 -07:00
Cheridan
a5e3851b99 Merge pull request #5216 from phil235/bodybagfix1 
closets can no longer contain a near infinite amount of mobs.
 2014-10-21 12:15:30 -05:00
hornygranny
e556867a58 Merge pull request #5277 from paprka/newshotguns 
Adds improvised shotguns and fixes paths for wrap paper
 2014-10-21 09:51:35 -07:00
phil235
c2fcd21499 Adding bluespace bodybags. Adding changelog. 2014-10-21 17:27:40 +02:00
phil235
56c853f9d6 Merge branch 'master' of https://github.com/tgstation/-tg-station into bodybagfix1 
Conflicts:
	code/modules/mob/living/simple_animal/friendly/mouse.dm
 2014-10-21 15:58:39 +02:00
paprka
c4668885ec Merge branch 'master' of https://github.com/tgstation/-tg-station into cooljackets 
Conflicts:
	icons/mob/suit.dmi
	icons/obj/clothing/suits.dmi
 2014-10-20 21:38:39 -07:00
paprka
74dfbeb92c adds bomber and leather jackets 2014-10-20 21:36:40 -07:00
hornygranny
1c9c6d5950 Merge pull request #5249 from phil235/DisplacedGirderFix 
Fix for #4602
 2014-10-20 20:18:06 -07:00
Cheridan
455b526cc1 Merge pull request #5318 from phil235/MsgFix2 
More messages fixed
 2014-10-19 21:39:06 -05:00
paprka
2a8e772131 Merge branch 'master' of https://github.com/tgstation/-tg-station into newshotguns 
Conflicts:
	code/modules/projectiles/ammunition/magazines.dm
	code/modules/projectiles/guns/projectile/shotgun.dm
	icons/mob/back.dmi
	icons/obj/gun.dmi
 2014-10-19 17:30:47 -07:00
Cheridan
4adb8c0c9a Merge pull request #5316 from xxalpha/fix_flasher 
Fixes cyborgs being able to add their flashes to things
 2014-10-19 17:44:30 -05:00