cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-18 21:15:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,164 Commits 61 Branches 14 Tags
dbd01d8a43e0967ffd7bb17cd910238df8753fb9
Commit Graph

1633 Commits

Author SHA1 Message Date
Miauw
91e56c0bac Makes some reagents not work on dead mobs instead of patches not working. 2015-08-14 12:37:32 +02:00
Cheridan
5979ffdec7 Logging Syntax Improvement 2015-08-13 12:14:14 -05:00
Swag McYolosteinen
46b519309e Merge pull request #11058 from Core0verload/surgery-organs-part2 
Surgery & Organs rework: Phase 2
 2015-08-13 18:04:16 +02:00
Miauw
b3e8af93e7 Makes patches not work on dead people. 2015-08-13 13:04:13 +02:00
Cheridan
be2d146a3d Merge pull request #11142 from SconesC/phlog 
Phlogiston no longer ignites every tick
 2015-08-11 20:30:17 -05:00
MMMiracles
35b78b1209 Revamps bioterror darts into a non-lethal syringe form. Removed the coniine and spore toxin to make it solely for quiet take-downs (in thoery). 2015-08-11 01:56:38 -04:00
SconesC
f80c92c5aa Corrects number mistake 2015-08-10 17:13:05 -07:00
SconesC
fcf3405c6b Phlog nerf + negative firestack bug fix 2015-08-10 17:09:34 -07:00
phil235
d2a4024e7f reagent reaction() now use more methods. Instead of just INGEST or TOUCH, we now have INGEST (for injection, ingestion), TOUCH (for splashing), PATCH (for patch application and blob attack), and VAPOR (for smoke, foam and spray application). 
- TOUCH no longer transfer reagent by default, it's now only used for touch based effect like being flammable when touched by fuel or you and your stuff being acided when touched by acid).

- PATCH does no transfer of its own (but actual patches code do make a transfer) but is used for touch effect that ignore clothes and protection (blob attacks, patches effect going through hardsuits)

- VAPOR does reagent transfer but it takes into account clothing protection

Fixes a typo in humanoid/get_permeability_prot
Fixes acid splashing on objects not destroying it. Fixes acid splashing on turf not destroying objects on the turf.

Changed damp rag smothering code a bit.

Blob Smoke now doesn't do anything.
 2015-08-09 14:23:12 +02:00
c0
2e5cedef74 Added alien organs 2015-08-09 01:12:32 +03:00
Kevin Chen
57870d14f1 Changes uranium to radium 2015-08-06 14:26:48 -04:00
KorPhaeron
6a71cd2f57 Toki Wo Tomare 
ZA WARUDO
 2015-08-05 15:54:41 -05:00
Jordie
d18f47f65c Merge pull request #10981 from lordpidey/lordpidey_spraytan 
Adds new chemical: spray tan
 2015-08-05 15:02:43 +10:00
Jordie
23d251594d Merge pull request #10947 from bgobandit/cutebiology 
Adds a water reaction to gold slimes + tweaks blacklist.
 2015-08-05 13:56:23 +10:00
Remie Richards
f124fe7a25 Merge pull request #10955 from Core0verload/ghostnotify 
Changes cloning ghost notifications to be less copypasta/snowfake
 2015-08-03 05:24:26 +01:00
Mike Long
56e824fdb7 Fixes compile error, and removes erroneous line of code. 2015-08-02 22:08:54 -04:00
Mike Long
3d53fa266e Collars no longer pop up if you aren't wearing a uniform. 
Added new saying.
 2015-08-02 21:56:42 -04:00
Cheridan
88b2180017 Merge pull request #10949 from phil235/SleepSmokeFix 
Fixes sleeping smoke never disappearing.
 2015-08-02 06:56:47 -05:00
Mike Long
7a9135ddaa Reduced the amount of speech and emote spam. 2015-08-02 00:04:23 -04:00
Mike Long
53cf253ddd Fixes compile error. Oops. 2015-08-01 23:40:03 -04:00
Mike Long
bb4e140ed1 Adds new chemical: spray tan 2015-08-01 23:30:49 -04:00
bgobandit
0a6d65472c Fixes bug. Restores /retaliate to blacklist. Adds changelog. 2015-07-31 12:06:57 -04:00
c0
7495bf3569 Changed default message to more useful 2015-07-31 18:56:16 +03:00
c0
95285e7946 Changed cloning ghost notifications to be less copypasta 2015-07-31 18:42:03 +03:00
phil235
6a0be8b9a3 Fixes sleeping smoke never disappearing. Also switching processing.Add(src) to processing |= src. 
Makes the empty space on the chem bottles sprites clickable.
Fixes a runtime with reagent_containers/throw_impact()
 2015-07-31 15:01:35 +02:00
bgobandit
751159b43d Adds a water reaction to gold slimes. Removes mobs from plasma/blood blacklist that shouldn't be blacklisted. 2015-07-31 01:04:26 -04:00
bear1ake
5af0bdec25 fix ian stuff 2015-07-31 01:18:03 +09:00
Jordie
9229890aae Merge pull request #10842 from lordpidey/lordpidey-new_chemicals 
Added a new medication, Miner's Salve
 2015-07-29 17:22:31 +10:00
Mike Long
101eae808d Gave Miner's salve a slight side effect when ingested, to show that it's designed to be applied, not ingested. 
Changed secondary recipe of Miner's Salve to be a sheet of iron+ a sheet of plasma + a twinkie in a grinder.  That seems more "ghetto chemistry"
Added grinder to mining station.
 2015-07-26 16:18:59 -04:00
Jordie
6e60aa2f08 Merge pull request #10791 from phil235/BeakerFeedingFix 
Fixes beaker feeding
 2015-07-25 19:11:21 +10:00
Jordie
ad2d7e1d0f Merge pull request #10789 from kingofkosmos/reentercorpselink 
Clickable re-enter corpse links
 2015-07-25 19:10:06 +10:00
Mike Long
c868336e78 Removed mixing messages as they didn't make sense. Also changed istype checks to iscarbon checks. 2015-07-24 19:44:33 -04:00
Mike Long
864ce2c525 Added a new medication, Miner's Salve 2015-07-24 19:04:55 -04:00
kingofkosmos
750e5d9b5e Changed span classes to include the re-entering link. 2015-07-23 18:58:15 +03:00
Jordie
b2948fcab7 Merge pull request #10659 from phil235/HandcuffOverlayFix 
Handcuff, fire, overlays_standing fixes
 2015-07-23 22:21:52 +10:00
phil235
677b24ab68 derp 2015-07-23 13:12:00 +02:00
phil235
9fab0f3641 Fixes beaker feeding not calling the right volume for the ingestion reaction. 
Same fix for ninja suit adrenalin boost.
Simplifies reagent_containers/glass/attackby() a bit.
 2015-07-23 13:05:53 +02:00
kingofkosmos
0095637eee Clickable link added to all re-enter corpse messages. 2015-07-23 10:50:45 +03:00
phil235
d2616d52fc Merge branch 'master' of https://github.com/tgstation/-tg-station into CatchThrownPieFix 
Conflicts:
	code/game/atoms.dm
	code/game/atoms_movable.dm
 2015-07-20 22:41:45 +02:00
phil235
76feff5dfa Merge branch 'master' of https://github.com/tgstation/-tg-station into HandcuffOverlayFix 
Conflicts:
	code/game/objects/structures/watercloset.dm
	code/modules/clothing/head/helmet.dm
	code/modules/mob/living/carbon/carbon.dm
 2015-07-20 22:37:06 +02:00
phil235
94d072828f Merge branch 'master' of https://github.com/tgstation/-tg-station into CatchThrownPieFix 
Conflicts:
	code/game/atoms_movable.dm
	code/game/objects/items/weapons/dice.dm
	code/game/objects/weapons.dm
	code/modules/flufftext/Hallucination.dm
	code/modules/mob/living/living_defense.dm
	code/modules/mob/living/living_defines.dm
	code/modules/reagents/reagent_containers.dm
 2015-07-19 21:53:39 +02:00
Cheridan
b9f67a8334 Merge pull request #10668 from phil235/CyborgFlashFix 
Fixes drone and cyborg not being affected by mounted flashers.
 2015-07-20 11:53:03 -05:00
phil235
9eced1ac5b Fixes thrown closet opening to not use spawn(). 
Fixes throw_at() to look nicely for xeno leap by adding the diagonals_first argument.
Removes useless gateway/Crossed and gateway/Bumped().
Changes throw_at() to use diagonal directions.
I replaced the atom variable "throwpass" with the LETPASSTHROW pass_flags
I readded hit_check proc to catch things getting on the thrown thing's tile during its sleep(1) (especially needed for mobs running towards the thing), the only other possibility would've been to add throwing checks in atom/movable/Crossed() (called after every move) and I don't think it'd be worth it.
I added the item var "thrownby" to be able to continue to log the thrower of the item when it hits a mob. It removes the need for a thrower argument in throw_impact() and hitby().
 2015-07-19 21:29:35 +02:00
Remie Richards
57b05f5a18 Merge pull request #10493 from phil235/SmokeFoamBuff 
Foam&Smoke buff, some tweaks to sorium/ldm effect, plus some fixes.
 2015-07-18 03:45:38 +01:00
Cheridan
e4c8928de1 Merge pull request #10656 from phil235/DroneBuckleDropFix 
Fixes buckled drones dropping what they're holding in their hands
 2015-07-17 21:40:32 -05:00
Cheridan
a4a7c21744 Merge pull request #10653 from phil235/Fixarino 
Three simple fixes again
 2015-07-17 15:49:41 -05:00
Cheridan
242c3e9f2f Merge pull request #10634 from Iamgoofball/patch-101 
Buffs the Bioterror Chem Sprayer
 2015-07-17 15:43:08 -05:00
phil235
e2d76a0116 Fixes drone and cyborg not being affected by mounted flashers. 
Remove eye stat damage from flashbang's bang() proc (eye damage is already handled in carbon/flash_eyes())
Changed many flash producing effect to affect all carbons instead of only humans.
The experimental weldingtool now produces less light than regular welding tool and can be used safely with only sunglasses.
 2015-07-17 17:12:16 +02:00
phil235
d72cbcaf2f - fixes handcuff overlay on monkey not showing. 
- Fixes the lack of handcuff icon on the hand screen object for alien humanoids..
- fix legcuff overlay not showing on monkey.
- fixes fire overlay for monkey, aliens and cyborg, no longer looks human shaped.
- Made the regenerate_icons's subprocs at the carbon level more OOP.
 2015-07-17 01:15:21 +02:00
phil235
236215b03c Fixes damp rag smothering 2015-07-16 17:20:08 +02:00