cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-18 13:04:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,223 Commits 61 Branches 14 Tags
017cd65250aa79b7ac7ffd4e1c1664e59628fa71
Commit Graph

15292 Commits

Author SHA1 Message Date
oranges
2aba5f48ef Merge pull request #18263 from pudl/big-daddy-thicc-dick 
Adds bar stools
 2016-06-07 12:59:34 +12:00
oranges
05b4e82e02 Merge pull request #18272 from xxalpha/nukemyshitup 
Syndicate toolbox now has syndicate screwdriver.
 2016-06-07 12:57:44 +12:00
oranges
98d9e3b619 Merge pull request #18249 from Incoming5643/D-D-D-Do_You_Have_It 
Meaty Ores will now drop guts in addition to meat
 2016-06-07 12:55:04 +12:00
Joan Lung
318b7268f8 Merge pull request #18108 from coiax/narnar-rune-ticker 
Nar'sie rune can no longer be scribed off station or on shuttles
 2016-06-06 18:56:10 -04:00
oranges
ccbc302876 Merge pull request #18282 from coiax/removing-spawn 
Removes spawn() from some things
 2016-06-07 10:21:54 +12:00
Jack Edge
8a1da445e3 Rip message var 2016-06-06 23:20:42 +01:00
oranges
744b722a12 Merge pull request #18241 from phil235/BloodRefactor 
Blood refactor stuff
 2016-06-07 10:09:35 +12:00
Jack Edge
91332dcaae Code review 2016-06-06 23:07:29 +01:00
Jack Edge
f7c05b8bd9 Nar'sie rune anti-cheese and autoinvoke 
🆑 coiax
rscdel: The Nar'sie rune automatically disappears if somehow transported
to a non-station z-level.
rscadd: The Nar'sie rune automatically invokes itself when drawn, and
every tick subsequently, so the Cultists of the Geometer can focus on
the more important task of congragating.
/🆑

- Made can_invoke() not require a user argument (for that auto-invoke)
- Removed unused user argument from fail_invoke, made message display an
argument (for that auto-invoke)
 2016-06-06 23:07:04 +01:00
oranges
0a05b7c433 Merge pull request #18256 from KorPhaeron/cleanup 
Removes some unused code
 2016-06-07 10:03:27 +12:00
oranges
ae0b8299a1 Merge pull request #18254 from xxalpha/double_niggers 
Fixed smooth shuttle walls not smoothing properly on rotation.
 2016-06-07 10:02:59 +12:00
PKPenguin321
09bb9cbcb9 fixes up some toy sword checks (#18252) 
removes broken check.
Fixes https://github.com/tgstation/tgstation/issues/18248
adds a missing return to account for nodrop items.
 2016-06-07 10:02:34 +12:00
Leo
356f5947e2 Hand of God: Gods can't hear another god's divine telepathy (#18251) 
Gods now can't hear other gods
 2016-06-07 10:02:00 +12:00
Cheridan
35c8e92ad7 Merge pull request #18265 from KorPhaeron/sword_fix 
Sword Fix
 2016-06-06 00:39:09 -05:00
Jack Edge
318ca08ecb Code review 2016-06-05 23:48:34 +01:00
Jack Edge
a01b48aa48 Removes spawn() from some things 
Yay, refactoring.
 2016-06-05 20:08:36 +01:00
phil235
94a5d5bfad Atom movable that are neither /mob nor /obj should not be picked by the closet insertion proc. (#18244) 2016-06-05 12:48:19 -05:00
phil235
40a371296a Adding lizard blood pack in medbay storage's freezer crate. 
Added a var/exotic_bloodtype to species, instead of hardcoding a lizard type.
Fixes proc for objects who should never be bloodied.
 2016-06-05 18:12:08 +02:00
oranges
69bd3575e3 Merge pull request #18228 from ChangelingRain/swordofRATVAR 
Additional Ratvar conversion effects and related changes
 2016-06-06 01:35:26 +12:00
oranges
ff611ff2ce Merge pull request #18202 from coiax/enables-lazy-cloning 
Clone pods now grab their ghost on maturity
 2016-06-06 01:33:55 +12:00
oranges
e1055df57f Merge pull request #18235 from coiax/when-it-happens-we-will-know 
[s] Makes winning a pulse rifle little more noticable
 2016-06-06 01:33:12 +12:00
oranges
1e4b2b512a Merge pull request #18234 from coiax/laughter-for-all 
Adds laughter demon to wizard's spellbook
 2016-06-06 01:29:13 +12:00
oranges
3e731b117b Merge pull request #18119 from Cruix/wanted_posters 
Adds wanted posters, printable from security record computers.
 2016-06-06 01:26:35 +12:00
oranges
c09046e3f1 Merge pull request #18201 from PKPenguin321/cmo-implanter 
Refines autoimplanter code, gives CMO single use autoimplanter for HUD augment
 2016-06-06 01:25:52 +12:00
oranges
050c42ff5e Merge pull request #18174 from coiax/holodeck-cold 
Adds two new holodeck levels
 2016-06-06 01:23:43 +12:00
oranges
0992b25903 Merge pull request #18189 from coiax/kill-all-laughter 
Try to protect the ones we hug
 2016-06-06 01:23:06 +12:00
oranges
bcb338b0c7 Merge pull request #18156 from X-TheDark/mech_battery_tweaks 
Mechs rememeber removed cell's charge level and adjust inserted one's accordingly
 2016-06-06 01:17:57 +12:00
Nerd Lord
50f2c15945 follow links 2016-06-05 09:10:27 -04:00
Nerd Lord
e816738280 Merge branch 'master' of https://github.com/tgstation/tgstation into swordofRATVAR 2016-06-05 09:03:22 -04:00
xxalpha
d1dbcd3ee0 Syndicate toolbox now has syndicate screwdriver. 2016-06-05 12:29:45 +01:00
Nerd Lord
3c26a58a63 converted borgs/ais can control clockwork airlocks 2016-06-04 23:54:06 -04:00
Nerd Lord
8097a176bc set_ 2016-06-04 23:13:17 -04:00
Nerd Lord
428bbf6c75 heh heh 2016-06-04 22:44:49 -04:00
Nerd Lord
bc11440c68 shards 2016-06-04 22:38:40 -04:00
Nerd Lord
9928e97ab6 adds potential for two-way gateways 2016-06-04 22:36:16 -04:00
KorPhaeron
ead7bd090a Sword Fix 2016-06-04 20:08:38 -05:00
pudl
a76f6748bd adds stupid shitty bar stools 2016-06-04 19:06:52 -05:00
KorPhaeron
bc7fd50271 Removes unused code 2016-06-04 17:18:57 -05:00
xxalpha
7ee4c3e1f1 Fixes smooth shuttle walls not smoothing properly on rotation. 
shakaiseiginosenshi
 2016-06-04 21:34:04 +01:00
Nerd Lord
a322291044 layering 2016-06-04 15:31:26 -04:00
Nerd Lord
12efe6788d fixes the fucking pixel shift 2016-06-04 15:03:49 -04:00
PKPenguin321
fecf0fbff0 removes rogue period (#18250) 2016-06-04 13:38:25 -05:00
Joan Lung
d81db92008 Merge pull request #18214 from coiax/follow-link-define 
Refactors all (F) links into using a define
 2016-06-04 14:36:31 -04:00
LatD
1343f15cb4 Fix cloner loss of power message (#18187) 2016-06-04 20:24:04 +02:00
Incoming
7563a0dcf3 Meaty Ores will now drop guts in addition to meat. Xeno Meaty Ores will drop useful xeno organs. 2016-06-04 14:20:07 -04:00
Nerd Lord
51258f5784 fix 2016-06-04 14:00:57 -04:00
Nerd Lord
9a07805b83 300 is not 5 minutes 2016-06-04 13:48:12 -04: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
Nerd Lord
9405446e08 important check 2016-06-04 11:20:59 -04:00