cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-26 09:03:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,982 Commits 61 Branches 14 Tags
c2ddfc0155db689a34dcaf4cbc8f8b583fa75d28
Commit Graph

3412 Commits

Author SHA1 Message Date
Cheridan
b67043f267 Merge pull request #6329 from phil235/HungerChange 
Hunger change
 2014-12-14 12:55:21 -06:00
tkdrg
dc654e74db Removes white ian undershirt 
As requested by the head coders. Too many ian shirts.
 2014-12-14 15:21:28 -03:00
tkdrg
b983176937 Merge remote-tracking branch 'upstream/master' into fashionandfashionaccesories 
Conflicts:
	icons/mob/uniform.dmi
	icons/obj/clothing/uniforms.dmi
 2014-12-14 11:59:45 -03:00
Razharas
0b26a71a71 Merge pull request #6333 from tkdrg/singulobj 
The singularity/narsie are no longer machines
 2014-12-14 10:02:39 +03:00
phil235
f87da5939a Making nutrition level values into defines. 
Adding a changelog.
Snack vending machine's chef compartment is locked with kitchen access but can be emagged or hacked.
Adding feedback message for the user when its metabolism_efficiency changes.
Negative satiety can make you jitter a little bit at times. (probability linked to your satiety)
 2014-12-13 17:15:35 +01:00
tkdrg
79e8ad4142 The singularity/narsie are no longer machines 2014-12-12 19:42:37 -03:00
phil235
f9dff2f626 Balancing nutrition and fixing some nutrition stuff that I had missed. 2014-12-12 13:59:31 +01:00
Hornygranny
98a865298a Merge remote-tracking branch 'remotes/upstream/master' into emagrefactor 
Conflicts:
	code/game/mecha/mech_fabricator.dm
 2014-12-11 13:53:37 -08:00
phil235
7bd9b86652 Changes the hunger system in various ways. New hunger hud icons. Food w/o sugar can be loaded in snack vending machines by anyone. Adding two new var for mobs "satiety" and "metabolism efficiency". Rearranging datum/reagents, all "good" medical reagents are under datum/reagent/medicine/ and all food&drink reagents are under datum/reagent/consumable. Adding a pizza crate to cargo orders. Growns and cooked food are given vitamins while junk food are all given sugar. Removed some unnecessary code in Chemistry-Reagents.dm . 
high satiety+fed = higher metabolism_efficiency, lower if starving. Sugar digested drains satiety and vitamin raises satiety. Negative satiety means faster nutrition drop. Positive high satiety means lower chance to spread viruses. metabolism efficiency affect metabolization speed of healing and damaging reagents and the efficiency of bodytemp stabilization via calory use.
 2014-12-11 20:46:27 +01:00
Cheridan
05f5a1223d Merge pull request #6131 from paprka/injurydoll 
Health doll, UI improvements
 2014-12-11 12:42:06 -06:00
Cheridan
3ede77face Merge pull request #6189 from Menshin/exofab_revamp_end+fixes 
Exofab revamp finishing and fixes
 2014-12-11 11:52:16 -06:00
Cheridan
91d6fb38b9 Merge pull request #6245 from tkdrg/hudwhyyoudothistome 
/datum/atom_hud (Passive HUDs) bugfixes
 2014-12-11 08:39:12 -06:00
Cheridan
e3016f582d Merge pull request #5956 from RemieRichards/SpaceNooneHearScreams 
In space, no one can hear you scream
 2014-12-10 17:43:32 -06:00
Hornygranny
72132b1bf1 fixes whitespace 2014-12-09 16:32:16 -08:00
Hornygranny
af3f1aa4d8 Merge remote-tracking branch 'remotes/upstream/master' into emagrefactor 
Conflicts:
	code/game/machinery/deployable.dm
	code/game/objects/items/weapons/storage/lockbox.dm
	code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
	code/modules/clothing/glasses/hud.dm
	code/modules/mob/living/silicon/robot/robot.dm
 2014-12-09 16:03:45 -08:00
Cheridan
347e7ecf9d Merge pull request #6135 from Menshin/species_radiation_processing_fix 
Fixes radiation levels processing for aliens, brains and monkeys
 2014-12-09 09:31:31 -06:00
Cheridan
a7c2b14d83 Merge pull request #6159 from optimumtact/halfthecake 
Removed nearly all move penalties while in space
 2014-12-09 08:46:54 -06:00
Razharas
cc8c221fab Merge pull request #6257 from as334/Slimes 
Add's more stuff for Xenobiology and slimes
 2014-12-09 06:44:12 +03:00
Razharas
d61ecfa324 Merge pull request #6181 from GunHog/Autosay_Fix 
Lets AI and Borgs control radio behavior for auto announcements.
 2014-12-09 01:16:48 +03:00
GunHog
b9531ad5e7 [r] -> [radiomod] 
Just changes instances of [r] to [radiomod]. No functional changes.
 2014-12-08 15:40:45 -06:00
tkdrg
4237c406e4 Merge branch 'master' of https://github.com/tgstation/-tg-station into fashionandfashionaccesories 
Conflicts:
	code/game/objects/structures/crates_lockers/closets/wardrobe.dm
 2014-12-08 13:53:31 -03:00
tkdrg
e2c15d5210 Merge branch 'master' of https://github.com/tgstation/-tg-station into hudwhyyoudothistome 
Conflicts:
	code/modules/hydroponics/hydroponics.dm
 2014-12-08 13:48:22 -03:00
Swag McYolosteinen
b828448645 Merge pull request #6228 from paprka/coatscoats 
Adds winter coats and changes labcoat toggling
 2014-12-08 11:35:56 +01:00
Swag McYolosteinen
bff2e62a0f Merge pull request #6175 from Razharas/ExActFix 
Fixes ex_act() destroying too much shit
 2014-12-08 08:03:35 +01:00
as334
766780ca98 Testing if git has unfucked. 2014-12-07 22:17:41 -05:00
as334
f3e2c2d1f9 Add's feedback, changes plasma usage. 2014-12-07 21:35:52 -05:00
Razharas
5a78aa83be Merge pull request #6225 from NecroticBinder/Clean_Slime_Fix 
Clean slime fix
 2014-12-08 04:31:58 +03:00
as334
f21e9d0a6b Adds neat slime stuff 2014-12-07 16:20:31 -05:00
tkdrg
3e97e935af /datum/atom_hud (Passive HUDs) bugfixes 
Moves antag_hud image and datum to mind instead of mob.

Fixes mobs keeping data HUDs after transfer_to().
Fixes gibbed bodies losing their antag HUDs.
Fixes the data hud disappearing when dropping unrelated HUDs.

Fixes #6206
Fixes #6209
 2014-12-06 15:05:23 -03:00
Razharas
6fb548b283 Merge pull request #6220 from MrPerson/yet_another_attempt_at_fixing_this_shit 
Fixes mobs getting moved on the escape pods when buckled
 2014-12-06 07:42:12 +03:00
Razharas
7758a0afed Ok now explosions shall work properly 
Changed severity to target, make items not destroy themselves on
severity lower than 1, all that stuff
 2014-12-05 23:21:48 +03:00
Razharas
6ce052f45a Merge branch 'master' of https://github.com/tgstation/-tg-station into ExActFix 2014-12-05 20:45:27 +03:00
paprka
9e9b8b440d adds winter coats and changes labcoat toggling 2014-12-04 21:29:21 -08:00
tkdrg
acd956179b Merge remote-tracking branch 'upstream/master' into fashionandfashionaccesories 
Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
 2014-12-04 20:47:29 -03:00
NecroticBinder
aff046443a Update say.dm 2014-12-04 15:30:20 -06:00
Cheridan
f909d59d1a Merge pull request #6130 from phil235/AttackMsgStandardizedFormat 
Standardizing attack messages to always show the attacker first
 2014-12-04 12:45:31 -06:00
Remie Richards
36493cdc62 Merge branch 'master' of https://github.com/tgstation/-tg-station into SpaceNooneHearScreams 
Conflicts:
	code/__DEFINES/misc.dm
 2014-12-04 16:52:50 +00:00
MrPerson
47c46844f2 Another buckling fix 
Fixes #5730

The ride never ends
 2014-12-04 05:42:21 -08:00
hornygranny
bc9d9f6d58 Merge pull request #6105 from RemieRichards/AcidProtectionUpdate 
Acid protection update
 2014-12-03 10:28:47 -08:00
phil235
dcb48e3168 Merge branch 'master' of https://github.com/tgstation/-tg-station into SpanFix1 
Conflicts:
	code/modules/mob/living/simple_animal/friendly/corgi.dm
 2014-12-03 18:59:32 +01:00
GunHog
ee94f32aa3 Merge remote-tracking branch 'remotes/upstream/master' into Autosay_Fix 
Conflicts:
	code/modules/mob/living/silicon/silicon.dm
 2014-12-03 11:11:02 -06:00
Swag McYolosteinen
501ecb1d2a Merge pull request #5945 from JJRcop/get_ghost-fix 
Fixes unreported issue with get_ghost
 2014-12-03 17:45:07 +01:00
Remie Richards
16506dabc9 Merge pull request #6162 from tkdrg/simplepush 
mob/Bump() refactor
 2014-12-03 16:43:58 +00:00
Remie Richards
8eced8d302 Merge pull request #6134 from Menshin/null_loc_mobs_fix 
Prevent some mobs from spawning in nullspace
 2014-12-03 16:39:30 +00:00
hornygranny
3388c53838 Merge pull request #6110 from tkdrg/aiaiai 
Fixes exploit that lets AIs use machinery even after cameras are disabled
 2014-12-02 18:40:28 -08:00
Orange Borg
78216b8217 Temp + weight + suit weight no longer slows out of gravity 
Space is still slightly slower without a jetpack.
 2014-12-03 13:44:38 +13:00
Menshin
ba44b325d3 Finished the exofab revamp: 
* designs are now using the construction time var and the hacky /obj/item/mechavars is gone
* designs updated : there shouldn't be "no material" designs anymore
* cleaned the objects of their construction_cost and construction_time vars
* fixes the material name being displayed with $ character before
* this also fixes the overlay animation in inserting sheets
* the category var is now a list, so parts can be build/used with several chassis (fixes the Firefighter Chassis appearing when building Ripley)
* properly fix the href vulnerability when emptying (you can now remove all sheets of a materiel at once)
* the exofab now won't create a material sheet if there's not enough material (e.g 1000 metal)
* the exofab now won't accept a sheet if it would overstuff it (losing some material in the process)
* cleaned the code a bit (simplified, streamlined, using global vars, etc)

Finish #5722 and fixes #5954.
 2014-12-02 23:00:22 +01:00
GunHog
6ac3d8f2e8 Lets AI and Borgs control auto announcements 
The AI and cyborgs can now control if they speak on the radio and the
channel used when stating laws or  (AI only) announcing new player
arrivals.
 2014-12-02 11:43:36 -06:00
Razharas
f4f3768d70 Fixes ex_act() destroying too much shit 
Borg modules are safe
So are items with bomb protection
Items in people who wear bomb-protective gear are safe too
 2014-12-02 18:30:56 +03:00
tkdrg
74d73b29aa mob/Bump() refactor. OOPing and general cleanup. 
Removes copy-paste. Creates three new mob/living procs.
ObjBump, MobBump and PushAM which are called by mob/living/Bump().
Removes a ton of copy-paste and needless code.
Also fixes simple_animal Bump() on harm intent.
Previously, they'd move twice.
Fixes #3550
 2014-11-30 22:51:17 -03:00