cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-05 22:43:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,993 Commits 60 Branches 14 Tags
64c19bd2d3c95b0e27bd7112ca679779eaba407b
Commit Graph

315 Commits

Author SHA1 Message Date
LatD
d89eb178c6 Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-30 18:33:55 +03:00
LatD
65a0027979 Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-28 01:37:55 +03:00
Shadowlight213
ce01058e7c Fixes merge conflicts 2016-05-27 15:36:56 -07:00
Joan Lung
2cfb2d8eed Layers are now defines (#17949) 
* Layers are now defines

* this looks better

* GAS_phil_LAYER

* no message

* remove the three unneeded defines

* no message
 2016-05-27 22:16:21 +02:00
LatD
67190cb762 Fixes things found in testing 2016-05-26 23:30:42 +03:00
LatD
a6680b9f06 Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-26 19:02:46 +03:00
Jordie
91e7bd52ac Merge pull request #17909 from KorPhaeron/brain 
Fix for fiery dismemberment
 2016-05-26 10:13:35 +10:00
LatD
f36237a67d Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-25 18:45:31 +03:00
LatD
e7d5be221e Small fixes and changes 2016-05-24 23:04:00 +03:00
LatD
907fc36e5c Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-24 22:17:44 +03:00
KorPhaeron
7d51772b39 Fix for fiery dismemberment 2016-05-24 10:52:42 -05:00
Jack Edge
7f49175967 Renames files under code/ with naughty characters 
Like seriously, don't use spaces in file names, this is a codebase,
they're annoying. Hopefully Github will show these renames correctly.
 2016-05-24 12:16:19 +01:00
oranges
ccf693ae44 Merge pull request #17819 from Core0verload/toolbox_arm 
[#17310 Re-Open] "Toolbox Arm" printable at exosuit fabricators and protolathes
 2016-05-23 20:06:34 +12:00
LatD
7d6b3e6847 origin and req lvl changes 2016-05-21 17:17:20 +03:00
oranges
5a800f970b Merge pull request #17623 from RemieRichards/ItsAlive!ITSALIVE! 
Enables Frankensteins
 2016-05-22 01:54:02 +12:00
AnturK
c2e3a4d2b6 Merge pull request #17703 from coiax/eight-chamber-heart 
Lungs and hearts for mutant species
 2016-05-21 11:08:05 +02:00
c0
fb2a0961ff "Toolbox Arm" printable at exosuit fabricators and protolathes 2016-05-21 06:35:32 +03:00
Shadowlight213
86cbe14d15 Conflict fixes 2016-05-19 20:42:26 -07:00
Jack Edge
592cc8983f Made description more american 
FREEDOM etc.
 2016-05-19 16:39:10 +01:00
LatD
502249831d Syndicate origin tech changes 2016-05-18 20:12:01 +03:00
c0
3c55ec5645 Fixes anything location-dependend not working as cavity implants 2016-05-18 11:36:33 +03:00
LatD
fe76e64641 Origin tech changes and some fixes 2016-05-17 20:57:01 +03:00
Jack Edge
d688dbc1ea Fun description messages for severed limbs 2016-05-16 21:39:21 +01:00
Incoming5643
01ce91bf6d Specflag'd Dismemberment (#17469) 
* Adds NODISMEMBER to the species specflags to remove the var. It's not DISMEMBER because that's the default expectation and specflags need to be manually set for every race.

Merges RESISTHEAT and RESISTCOLD into RESISTTEMP. Every situation where one occurred the other did as well. It also doesn't make thermodynamic sense that something good at one wouldn't be good at the other anyways.

* T H E S E  A R E  N O T  B I T F L A G S
 2016-05-15 22:05:42 +02:00
Jack Edge
752de6d34d Fixes #17651; missing limbs needed for message 
Fleshmend now only produces a visible message if there are actually
limbs missing, where before it always triggered.
 2016-05-14 11:31:55 +01:00
Joan Lung
b0a0063a86 Merge pull request #17425 from coiax/voiced-skeletons 
Some talking toys now audibly chatter
 2016-05-13 14:45:12 -04:00
Razharas
b46de70537 Makes dismemberment more adjustable (#17587) 
* Makes dismemberment more adjustable

Makes dismemberment more adjustable
Items now return chance for dismemberment
Bodyparts now decide if they are dismemberable or not by the specific
item
Items now decide what sound to play on dismemberment
No balance changes here

* Owner into H

Owner into H
 2016-05-13 20:27:06 +02:00
Jack Edge
889c7240f0 Merge branch 'master' into voiced-skeletons 2016-05-13 18:37:23 +01:00
Remie Richards
b41ebae149 Allows you to frankenstein organic limbs onto people (including from different species!), dealing an appropriate amount of tox damage 2016-05-12 23:05:19 +01:00
Shadowlight213
320bb39eba Removes abductor ability to use guns. (#17515) 
* Removes abductor ability to use guns.
Removes agent starting out with an alien blaster

* removes comment

* Makes Abductors able to use alien pistol

Alien pistol now has ALLOW_ALL trigger guard to overcome abductor's
natural NOGUN.

Pistol now starts in the backpack, and the wondertool on the belt.

In addition:
 - Replace multiple copies of IsAbductor() with a single isabductor()
   proc in code/__HELPERS/mobs.dm
 - Adds icon for alien firing pin
 - Adds abductor span for ayylien communication
 2016-05-11 20:28:52 +01:00
Jack Edge
a30736e983 Bug fixes and griffin noises 2016-05-10 10:16:11 +01:00
Cheridan
8f6a5f7f1f Merge pull request #17508 from KorPhaeron/cutandtake 
Continues to inch dismemberment threshhold downwards
 2016-05-10 02:26:21 -05:00
coiax
d563246022 Added the bone tongue to skeletons (#17479) 2016-05-09 18:23:15 +02:00
KorPhaeron
31c03c7360 Dismemberment 2016-05-09 01:48:34 -05:00
Shadowlight213
6191cf0add Merge conflict fix 2016-05-08 16:43:51 -07:00
Shadowlight213
9573fdec0e Speed in nograv works correctly now 
Dismemberment support added as well as a way to use the limbs of another species for dismemberment for visually identical species
Flying var changed to species flag
 2016-05-08 16:39:54 -07:00
KorPhaeron
024df00cd9 Dismemberment tweaks (#17453) 
* Dismemberment tweaks

* Lowers some AP to address remies concerns

* Lowers the dualsaber AP again to prevent nonsense from occuring

* Adds HF blade

* Honk Dagger typo fix

* Lowers chaplain AP again
 2016-05-08 20:55:44 +01:00
phil235
53c5b7f5d5 Fixes lizard body markings appearing behind the bodypart layer. 
Fixes tail sprite when missing a leg and facing south.
Adds an admin option in human VV to remove a body part.
Fixes typos.
Fixes being able to toggle hardsuit and wintercoat helmet despite having no head.
Changes the dismemberment chance from explosion: bomb armor helps against it, and the maximum number of limbs that you can lose in one explosion is capped depending on the explosion severity.
Missing 1 or 2 legs makes you significantly slower. If without legs, missing an arm makes you slower. You can no longer move when missing all four limbs.
Bodyparts have now force 3 and throwforce 3
Tongues are now properly put in decapitated heads.
Shaking a legless person no longer gives weird results.
 2016-05-07 01:00:00 +02:00
phil235
1ef1117cb1 Fixes the healthdoll not being updated right away after an amputation. 2016-05-06 02:18:05 +02:00
phil235
76a7fca8fe Some adjustments, following suggestions in the PR discussion. 2016-05-05 21:50:30 +02:00
phil235
68da092009 Dismemberment port from Hippie code, based on RemieRichard's work. Big thanks to RemieRichards and crystalwarrior. 2016-05-05 18:17:51 +02:00
nullbear
241b1c10c7 Adds a few organ verbs 2016-04-14 18:53:08 -07:00
Incoming
e5602f5220 Fixes xeno hissing. the dangerous result of testing sounds while the station started with no atmosphere 2016-04-13 19:15:10 -04:00
Joan Lung
28d543aa8b Merge pull request #16704 from Incoming5643/Its_3_am_and_I_am_too_dazed_to_make_a_clever_branch_name 
Tongues
 2016-04-11 19:44:36 -04:00
Incoming
dfc6e55eaf Implements Cheridan's tongue sprites. Oh baby. 2016-04-11 19:23:05 -04:00
Incoming
513d5b12dc Generalize the system down to carbon, adding a xeno tongue that handles the actual hissing sound. 
Moves the tongue organ to the mouth
Fixes up synth inheritances
Losing your tongue no longer makes you silent, but rather just makes you a lot harder to understand
Little misc things
 2016-04-09 21:55:44 -04:00
Remie Richards
c816da8505 Updates cursed hearts to use the client_colour system. 2016-04-07 22:17:38 +01:00
Incoming
b2b02887ec Tongues WIP 
Adds tongues, which serve as the physical manifestation of speech impediments.
 2016-04-07 02:59:23 -04:00
duncathan
3f1375ba39 Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs 
Conflicts:
	_maps/RandomZLevels/Cabin.dmm
	_maps/RandomZLevels/beach2.dmm
	_maps/RandomZLevels/caves.dmm
	_maps/RandomZLevels/research.dmm
	_maps/RandomZLevels/snowdin.dmm
	_maps/RandomZLevels/undergroundoutpost45.dmm
	_maps/map_files/DreamStation/dreamstation04.dmm
	_maps/map_files/EfficiencyStation/EfficiencyStation.dmm
	_maps/map_files/MetaStation/MetaStation.v41I.dmm
	_maps/map_files/MiniStation/MiniStation.dmm
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
	_maps/map_files/generic/z4.dmm
	_maps/templates/lavaland_surface_automated_trade_outpost.dmm
	_maps/templates/lavaland_surface_biodome_winter.dmm
	_maps/templates/lavaland_surface_prisoner_crash.dmm
	_maps/templates/lavaland_surface_seed_vault.dmm
	code/controllers/subsystem/air.dm
	code/game/asteroid.dm
	code/game/atoms.dm
	code/game/gamemodes/nuclear/nuclearbomb.dm
	code/game/machinery/computer/arcade.dm
	code/game/objects/effects/aliens.dm
	code/game/objects/effects/overlays.dm
	code/game/objects/items/apc_frame.dm
	code/game/objects/structures/false_walls.dm
	code/game/objects/structures/girders.dm
	code/game/turfs/simulated.dm
	code/game/turfs/simulated/floor/fancy_floor.dm
	code/game/turfs/simulated/floor/mineral_floor.dm
	code/game/turfs/simulated/floor/plating.dm
	code/game/turfs/simulated/river.dm
	code/game/turfs/simulated/walls_misc.dm
	code/game/turfs/simulated/walls_reinforced.dm
	code/modules/admin/verbs/buildmode.dm
	code/modules/atmospherics/environmental/LINDA_turf_tile.dm
	code/modules/events/spacevine.dm
	code/modules/flufftext/Hallucination.dm
	code/modules/holodeck/turfs.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mob/interactive.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/simple_animal/bot/floorbot.dm
	code/modules/mob/living/simple_animal/guardian/guardian.dm
	code/modules/mob/living/simple_animal/hostile/hostile.dm
	code/modules/mob/mob_movement.dm
	code/modules/power/singularity/narsie.dm
	code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
	code/modules/research/server.dm
 2016-03-29 14:46:06 -06:00
duncathan
b9950c4358 turf/open and turf/closed 2016-03-29 13:38:56 -06:00