cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-02-08 15:28:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,554 Commits 63 Branches 14 Tags
d7eee00a0b22e1d968ccbcba9c53b4e9cbc42f28
Commit Graph

1353 Commits

Author SHA1 Message Date
Cheridan
47e2f50de5 Merge pull request #18440 from JStheguy/slave 
Easiest Fixes Ever Double Feature
 2016-06-11 13:29:44 -05:00
JStheguy
87ae4675fe Unhides Jumpsuits 
Wow, that was easier.
 2016-06-11 12:52:23 -05:00
c0
1a6fa0031d Adds explorer gas mask for lavaland miners 2016-06-11 10:38:53 +03:00
oranges
a08cff21f0 Merge pull request #18345 from TechnoAlchemisto/glass_bottles_don't_break_on_heads_as_easily_as_in_the_movies_I_would_know 
Renames and relores loyalty implants to mindshield implants.
 2016-06-09 15:39:53 +12:00
oranges
c5a84c769d Merge pull request #18036 from AnturK/init_meme 
Defers some list initializations
 2016-06-08 19:20:04 +12:00
Core0verload
3af3bd2938 R&D machinery refactor (#18295) 
* RnD machinery refactor

* Small changes

* Removed designs selling
 2016-06-08 17:18:22 +12:00
AnturK
19eb97ae18 Moves some list initializations to New 
Fixes missing ..() calls in New()
 2016-06-07 18:39:13 +02:00
TechnoAlchemist
154982500b God is good. 2016-06-07 04:54:06 -07:00
LatD
25827d6ccb [Ready] Tweaks some R&D levels (#18246) 
Removes tech levels from some traitor objectives. They had tech levels even before the remake but apparently now that the levels got raised that became a problem. Also some small tweaks to other items to make some early levels easier to get.
 2016-06-07 20:18:19 +12:00
oranges
e06b7d52f2 Merge pull request #18205 from Steelpoint/Vest 
Vest Buff (Vest, Helmet, Warden Hat)
 2016-06-07 16:43:35 +12:00
oranges
017cd65250 Merge pull request #18047 from kevinz000/embraceTheMemes 
Reactive Table Armor - If you can't beat the memes, embrace them
 2016-06-07 13:03:08 +12:00
phil235
bd20c313b9 Merge branch 'master' of https://github.com/tgstation/-tg-station into BloodRefactor 
Conflicts:
	code/__DEFINES/genetics.dm
	code/modules/mob/living/carbon/human/species_types.dm
 2016-06-04 17:41:43 +02:00
phil235
b482764a19 - I made human/handle_blood() less shitty. 
- We no longer leave a blood trail if blood_volume is below a certain level which depends on the brute damage received. This way dragging a wounded player does have a bad effect.
- We no longer give humans a second reagents var containing blood, and we don't put exotic blood in the mob's reagents. Now we don't store any blood substance inside the mob, we only have a blood_volume var. When we draw blood with syringe we create the reagent that match the type (blood reagent, or an exotic blood reagent)
- can't draw blood from mob if it's low on blood, so we can't empty a mob of its blood entirely.
- Removed the blood type preference appearing in character setting.
- blood pack automatically show blood type, unless manually labeled.
- removed bloody_hands_mob human var and same name glove var.
- Some animals now have blood (pets, goat, cows)
- hitting and dragging mobs with actual blood in their veins leaves blood on you and a trail on the floor.
- probably other stuff that I'll mention in the PR.
 2016-06-04 17:33:16 +02:00
TechnoAlchemist
d75ded29fa Adds all-seeing-eye to necropolis chests. (#18160) 
* Swaps xray syringe with new item.

* blankspace

* standards
 2016-06-04 02:52:04 -05:00
Thunder12345
a9a97f5a81 Fixes for Merge Tokens (#18168) 
* fixes #15649
fixes #16575

* oops forgot those lines
 2016-06-03 14:46:42 -05:00
Steelpoint
28e569b356 InitalCommit 2016-06-03 15:32:46 +08:00
Jordie
4c8f8ae53e Merge pull request #18154 from PKPenguin321/plant-analyzer-repath 
Repaths plant analyzers
 2016-06-03 16:41:02 +10:00
Razharas
9fdae2fe4e Merge pull request #17576 from LatD/Research 
[Ready for test/merge] R&D level remake
 2016-06-02 18:41:43 +03:00
PKPenguin321
cf71a5833f repaths plant analyzers 
so they are no longer children of regular analyzers
 2016-06-01 22:44:03 -07:00
kevinz000
b24e66196f . 2016-05-30 17:32:44 -07:00
PKPenguin321
537b8d85dc adds letterman jackets 2016-05-30 17:13:00 -07:00
kevinz000
70a7757533 "fix" 2016-05-30 15:26:02 -07:00
LatD
d89eb178c6 Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-30 18:33:55 +03:00
kevinz000
f32a0e63a1 fix? 2016-05-29 20:49:35 -07:00
kevinz000
ddca68fd27 * 2016-05-29 18:47:21 -07:00
kevinz000
169526997c cooldownsandmemes 2016-05-29 18:47:03 -07:00
kevinz000
1de9702e72 embracedemmemes 2016-05-29 18:35:06 -07:00
xxalpha
58fa245d43 Removal of station hardsuit jetpack 
not the shields
 2016-05-29 11:05:16 +01: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
Jack Edge
bc113b6aa2 Refactors NOREACT flag; minor cig refactor 
The reagents datum now has its own flags, which currently includes
REAGENT_NOREACT, which functions in the same way. Shouldn't be touched
directly, use set_reacting(bool) to modify it, as modification also adds
or removes the reagents datum from the SSobj.processing list.

Also refactors cigs a little, adds a Destroy(), uses the open_flame()
proc for the hotspot exposure.
 2016-05-26 10:12:59 +01:00
LatD
907fc36e5c Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-24 22:17:44 +03:00
AnturK
802cdf9f5c Merge pull request #17839 from optimumtact/watisgoinon 
Fix an antipattern when using canUseTopic
 2016-05-24 17:46:11 +02:00
Steelpoint
3f50399bda Red Security Sprites (#17784) 
* InitalCommit

* MergeConflict
 2016-05-23 11:04:52 -05:00
oranges
1f6c9e34a4 Merge pull request #17830 from Bawhoppen/ertfix 
Fixes ERTs not spawning with correct stuff
 2016-05-23 18:45:07 +12:00
Cheridan
c94492664f MMmiracles away mission cleanup (#17873) 
* MMmiracles away mission cleanup

* tomb ruin fix
 2016-05-23 00:46:04 -05:00
oranges
947e2c5c19 Fix an antipattern when using canUseTopic 
remove redundant range checks that are checked in the fixed canUseTopic
 2016-05-22 00:23:47 +00:00
Lularian
19eae8c0aa ert medbeammemes 2016-05-21 13:55:25 -05:00
LatD
7d6b3e6847 origin and req lvl changes 2016-05-21 17:17:20 +03:00
oranges
6486b588c6 Merge pull request #17333 from nullbear/less-wetness-updates.-Ice-sliding-in-no-slips- 
Wetness stuff.
 2016-05-21 14:46:09 +12:00
KorPhaeron
1cbf7e1b8e Drake Armour 2016-05-19 00:18:56 -05:00
LatD
502249831d Syndicate origin tech changes 2016-05-18 20:12:01 +03:00
KorPhaeron
0cf94ad6b0 Explorer Gear 2016-05-18 00:31:48 -05:00
KorPhaeron
34a7a89df1 Bone Sprites 2016-05-16 19:35:36 -05:00
Cruix
0a839f7461 swat mask now hides hair (#17675) 2016-05-14 19:24:39 -05:00
Joan Lung
8b656d2603 Merge pull request #17284 from MMMiracles/spookyjookie 
Lavaland Ruins
 2016-05-13 20:22:56 -04:00
Joan Lung
1313d45aff Merge pull request #17565 from KorPhaeron/cakehat3 
Nerfs cakehat
 2016-05-13 11:52:32 -04:00
KorPhaeron
d93f87cf96 Removes """""humour"""" 2016-05-12 03:18:05 -05:00
Cheridan
58319051dd Merge pull request #17558 from phil235/WashingFix 
Fixes washing machine
 2016-05-11 16:29:06 -05:00
Jordie
ea52cee578 Merge pull request #17511 from ChangelingRain/bootsuit 
Replaces miner jackboots with mining boots
 2016-05-11 22:59:36 +10:00