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
38,998 Commits 61 Branches 14 Tags
6cfd99ec00a7841002fd6d14eae664adb6bd5b7e
Commit Graph

5370 Commits

Author SHA1 Message Date
oranges
05b4e82e02 Merge pull request #18272 from xxalpha/nukemyshitup 
Syndicate toolbox now has syndicate screwdriver.
 2016-06-07 12:57:44 +12:00
KorPhaeron
3526562fa2 The joke was on me all along 2016-06-06 19:08:48 -05:00
PKPenguin321
5d76e239ef moves the parent call 2016-06-06 17:02:08 -07:00
KorPhaeron
cd4855688d Sad Trombone Implant 2016-06-06 18:49:14 -05:00
oranges
744b722a12 Merge pull request #18241 from phil235/BloodRefactor 
Blood refactor stuff
 2016-06-07 10:09:35 +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
Cheridan
35c8e92ad7 Merge pull request #18265 from KorPhaeron/sword_fix 
Sword Fix
 2016-06-06 00:39:09 -05:00
PKPenguin321
70c9cff674 fixes hulks attacking with dual eswords 2016-06-05 21:49:59 -07:00
GunHog
80065468d4 Hyper KA for mining borgies <3 
- Mining Cyborgs may now be upgraded with Hyper-Kenetic Accelerators
- Same cost and reqs as human version.
 2016-06-05 11:57:39 -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
xxalpha
d1dbcd3ee0 Syndicate toolbox now has syndicate screwdriver. 2016-06-05 12:29:45 +01:00
KorPhaeron
ead7bd090a Sword Fix 2016-06-04 20:08:38 -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
34c362e993 File name was wrong 2016-06-04 19:19:15 +03:00
LatD
1a3e75dfbb Add machine prototype item 2016-06-04 18:53:06 +03: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
65ba2d2800 Makes cloth not have force anymore. (#18204) 2016-06-04 01:23:29 -05:00
MMMiracles
7c8603a0a8 important features (#18195) 2016-06-03 14:48:12 -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
Jack Edge
e13725b179 Refactors all (F) links into using a define 
🆑
bugfix: Clicking the (F) link when an AI talks in binary chat will
follow its camera eye, the same as when (F) is clicked for its radio
chat.
/🆑

FOLLOW_LINK is a define that creates the clickable (F) link, so it
doesn't have to be typed painstakingly out every time we want to give
that link to an observer.
 2016-06-03 15:29:28 +01: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
oranges
c27a9a21bb Merge pull request #18070 from PKPenguin321/clothing-by-nienhaus 
Adds letterman jackets
 2016-06-02 09:01:29 +12:00
KorPhaeron
d5dddf5bae Kills the sword ghost properly 2016-05-31 17:13:59 -05:00
KorPhaeron
8d65a58e2c Fixes sword naming 2016-05-31 16:13:25 -05:00
KorPhaeron
9042c84087 The sword names itself now 2016-05-31 13:28:36 -05:00
KorPhaeron
d4240c5378 Merge remote-tracking branch 'refs/remotes/tgstation/master' into Igotpaid30dollarstodothis 
# Conflicts:
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
 2016-05-31 12:03:01 -05:00
KorPhaeron
26cbf2e3bb You've been down too long in the midnight sea 2016-05-30 23:35:03 -05:00
oranges
953fe2852b Merge pull request #18039 from coiax/alt-click-spraycan 
Adds alt-click to spraycans
 2016-05-31 15:55:22 +12:00
KorPhaeron
aea72a79fd New Chaplain Weapons 2016-05-30 22:01:51 -05:00
PKPenguin321
537b8d85dc adds letterman jackets 2016-05-30 17:13:00 -07:00
LatD
d89eb178c6 Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-30 18:33:55 +03:00
oranges
747977074f Merge pull request #17994 from coiax/fix-17957 
Fix: Gang tags can be sprayed over
 2016-05-30 11:00:40 +12:00
xxalpha
0d608250fa Changed AI core programming so it functions like the AI Upload. (#18004) 2016-05-30 10:54:50 +12:00
kevinz000
c88c964f26 Minor Tweaks for PK borgs + recharger (#17940) 
Cyborg rechargers now recharge a minimum of 200/tick, up from a default setting of 20/tick
PK borg cookie dispensers now have a 1 second cooldown
PK borg hug shocks has a 2 second cooldown up from 1
Cyborg hyposprays now log
PK borg harm alarm emagged will no longer stun you if you have bowman headset
PK borgs are the only cyborgs that can hugshock and hugcrush (I added hugs for it, medborgs, and standard borgs
 2016-05-30 10:52:52 +12:00
Jack Edge
0c95c90286 Adds alt-click to spraycans 
🆑 coiax
rscadd: Alt-clicking a spraycan toggles the cap.
/🆑
 2016-05-29 19:51:38 +01:00
Lularian
8aa135f470 fixes some of the crap maybe 2016-05-28 11:08:46 -05:00
Joan Lung
325d8aa807 Merge pull request #17954 from GunHog/Head_Megaphones_100_Percent_Meme_Free 
Head Megaphones + Megaphone changes
 2016-05-28 10:40:31 -04:00
Jack Edge
badec181c4 Bring back my APC checks 2016-05-28 13:55:07 +01:00
Jack Edge
e81fd145cc You saw nothing 2016-05-28 13:50:04 +01:00
Jack Edge
a729b83265 Fix: Gang tags can be sprayed over 
Fixes #17957.

🆑 coiax
fix: Gang tags can again be sprayed over.
/🆑

Also got rid of this APC check which doesn't work anyway because APCs
loc is on the floor and then it's pixel shifted.
 2016-05-28 13:40:51 +01:00
LatD
712c4e81a8 Code review improvements 2016-05-28 13:11:57 +03:00
Cheridan
e6c89f3b3a Merge pull request #17977 from lzimann/revert-17901-bawhoppen_copyen 
Revert "Removes some obselete attackby() code [Removes attackby crafting]"
 2016-05-28 00:37:19 -05:00
PKPenguin321
263afa7df4 Teleprods fixes (#17965) 
* fixes teleprods creating igniters

* undoes rogue dme change
 2016-05-27 21:32:01 -05:00
Leo
7304f31325 Revert "Removes some obselete attackby() code [Removes attackby crafting]" 2016-05-27 20:37:45 -03:00
Cheridan
edac9e2171 Merge pull request #17901 from MrPerson/bawhoppen_copyen 
Removes some obselete attackby() code [Removes attackby crafting]
 2016-05-27 18:02:42 -05:00
LatD
65a0027979 Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-28 01:37:55 +03: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
MrPerson
30edfe2570 Removes flamethrower slapcrafting 2016-05-26 19:15:38 -07:00
GunHog
fc386b3b0c Megaphones fix 
Megaphones now use say() instead of a custom override.
say() verb for living mods now accept spans as a third argument.
 2016-05-26 17:54:46 -05:00