cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-18 10:37:54 +01:00
Code Issues Packages Projects Releases Wiki Activity
38,763 Commits 72 Branches 14 Tags
05cd2245eb02b499e2d33e15ddc0d0fe024149cc
Commit Graph
30615 Commits
Author SHA1 Message Date
militaires 05cd2245eb holladolla bill 2016-10-02 05:53:09 +03:00
AnturKandGitHub 7ce4f1293d Merge pull request #20734 from CyberbossJHCB/NothingToSeeHere 
Showers now clean hands + bloody gloves fix
 2016-09-29 10:46:31 +02:00
AnturKandGitHub b6e79d25a4 Merge pull request #20713 from ChangelingRain/joancrushesbadgrammar 
Fixes the proto-kinetic crusher's attack verb tenses
 2016-09-29 10:44:42 +02:00
Joan LungandGitHub 69281c24ad Merge pull request #20738 from tgstation/revert-20553-touchdeepthewildnessinmetouchlightlythesinyoutakefrommesoirisebackunburdenedscarless 
phil branch name hell
 2016-09-28 19:01:20 -04:00
Joan LungandGitHub aaefef46b8 Merge pull request #20732 from optimumtact/justhrefthings 
Fix multiple href exploits from incorrectly scoped locates
 2016-09-28 19:00:44 -04:00
Joan LungandGitHub fde8904309 Merge pull request #20714 from phil235/EffectToStructure 
Changes a few children of obj/effect to be children of obj/structure.
 2016-09-28 18:12:52 -04:00
orangesandGitHub 2f7bf7e8ee Revert "Movable atoms now call Entered() on their loc in New()" 2016-09-29 10:24:17 +13:00
NikNakFlakandoranges 105c88ea43 powercreeps the powercrepe (#20687) 
It wasn't worth sacrificing the sabre for the crepe, and now it is. You sacrifice dismemberment chance for higher force and not having a sprite. Makes it more like the sabre from which it came.

Slather it up!
 2016-09-29 10:07:47 +13:00
orangesandGitHub a6fd33d914 Merge pull request #20729 from LanCartwright/Removesnanites 
Removes various unnecessary reagents in Survival medipens.
 2016-09-29 09:33:11 +13:00
orangesandKorPhaeron 18b1b9c328 Space carp ensure they still exist after animation sleep (#20710) 
This stops a runtime where the space carp Swell was called and
get_turf(src) resolved to null
 2016-09-28 11:01:43 -05:00
AnturKandGitHub a870c00343 Merge pull request #20709 from Jordie0608/icouldswearthiswasworkingbeforebutimnotsurehow 
Getrev wrong var patch
 2016-09-28 08:59:14 +02:00
oranges 8b7eb11df9 Fix multiple href exploits from incorrectly scoped locates 
Also adds a helper to flatten a keyed list to it's contents as it
turns out that byond cannot locate in a keyed list
 2016-09-28 06:55:45 +00:00
TheCarlSaganExpressandAnturK 36d6695319 Requested changes to #20637 (#20701) 
* Requests by Phil

* Additional Code
 2016-09-28 08:54:42 +02:00
JordieandGitHub 5273651be2 Merge pull request #20706 from Cuboos/Vape_Fix_for_real_this_time 
Vape Fix, no more Admin Spam edition.
 2016-09-28 16:50:51 +10:00
Akke 011ff9c07f 5 commits later 2016-09-28 02:16:53 +01:00
Akke 0ad1289f7a aaaaaaaaaaaaaaaaaaaaaaaaaaaa 2016-09-28 02:03:51 +01:00
Akke 520fa0c02d adds in nanites in a less ridiculous form 2016-09-28 01:56:22 +01:00
Cyberboss 9b11a70902 Git is hard 2016-09-27 20:16:36 -04:00
Akke 4fb739bc7c changes tricord from 15u to 20u 2016-09-27 23:11:44 +01:00
Akke 0d76c2812d Makes the survival medipen an actual SURVIVAL medipen 2016-09-27 22:34:52 +01:00
orangesandKorPhaeron e3ce14d8fc Fix an incorrect call to addtimer (#20691) 2016-09-27 15:59:35 -05:00
orangesandGitHub a7839b72d5 Merge pull request #20694 from MrStonedOne/patch-252 
Round end will now pre-load the admin selected round end sound to clients
 2016-09-28 09:55:24 +13:00
TrustyGunandoranges 4f16f585dd Lawyers have special speech bubbles (#20693) 
Lawyers now have new speech bubbles that is a reference to a popular video game series about lawyers.
 2016-09-28 09:54:53 +13:00
orangesandGitHub ca492ebcdb Merge pull request #20689 from KorPhaeron/shielded 
Shielded Hardsuit Fix
 2016-09-28 09:54:15 +13:00
orangesandGitHub bafaab0e02 Merge pull request #20678 from Shadowlight213/warningiconsrevert 
Moves warning floor icons back to the floors dmi
 2016-09-28 09:54:00 +13:00
Supermichael777andoranges 4d83d15a87 Cat men can now occupy all non-command roles (#20644) 
* Cats the erp musical

* I was told without secborgs that their was little reason for this.
 2016-09-28 09:53:09 +13:00
Iamgoofballandoranges 97fbf903d7 Renames station goal modifier (#20671) 
fucked up my "sta"-space-enter speed roundstart and is severely hindering local testing
 2016-09-28 09:52:15 +13:00
ExcessiveUseOfCobblestoneandoranges f02798d87d IMMENSE BUFF TO SECURE BRIEFCASES/WALLSAFE (#20668) 
SAY GOODBYE EMAG USERS! THE AGE OF THE MULTITOOL IS UPON US!

In Short: Removes Emag Function [aka Requiring a multitool], and has a lower chance to successfully hack [from 40% to 33%]

It doesn't make sense that something that has no place for an ID can be swiped with an overglorified ID. Git gud and use the multitool. Now when someone puts secure items in the secure safe, people won't laugh at them [i mean they probably still will, but it's ok].
 2016-09-28 09:51:53 +13:00
orangesandGitHub 93bf7d13c2 Merge pull request #20659 from uraniummeltdown/fasterstockparts 
Stock parts now build 5x faster
 2016-09-28 09:50:11 +13:00
phil235 b8681e9f30 Merge branch 'master' of https://github.com/tgstation/-tg-station into EffectToStructure 
# Conflicts:
#	code/modules/events/spacevine.dm
 2016-09-27 20:03:26 +02:00
phil235andphil235 6809603669 Changes obj/effect/blob,spider,swarmer,energy_net,spacevines to be ob/structures instead, since you can hit and destroy them. 
Adds a large ash and large molten item decal (for future use)
simplifies decal/cleanable/replace_decal() code a bit.
Changes construction() proc to on_construction() for consistency, same for deconstruction().
Made a deconstruct() proc for machinery and computer (also for future use).
 2016-09-27 19:58:27 +02:00
CheridanandGitHub b84064412b Merge pull request #20690 from Incoming5643/why_did_this_take_months 
Fixes weird limb updating bug
 2016-09-27 11:29:50 -05:00
CheridanandGitHub 70c318698f Merge pull request #20686 from Incoming5643/I_nerfed_it_too_hard 
Intensifies the secret satchel system so people will actually use it
 2016-09-27 11:24:22 -05:00
CheridanandGitHub 1cb43e6f53 Merge pull request #20692 from optimumtact/zombietongue 
Make say handling short out earlier to prevent runtimes
 2016-09-27 11:20:15 -05:00
Razharasandphil235 c4ad0dbdf1 Fixes planted kudzu missing colour and desc (#20681) 
* Fixes planted kudzu missing colour and desc

Fixes planted kudzu missing colour and desc

* Fixes language issues

Fixes language issues
 2016-09-27 17:56:29 +02:00
Joan Lung 4033224bdb Fixes the proto-kinetic crusher's attack verb tenses 2016-09-27 10:12:51 -04:00
AnturKandGitHub dc9abafa6f Merge pull request #20688 from optimumtact/immigrantshavenojobs 
Prevent the user selecting jobs before the job list has been intialised
 2016-09-27 13:50:31 +02:00
AnturKandGitHub 0b8dc7b0ae Merge pull request #20683 from ChangelingRain/alloutofbubblegum 
Slight bubblegum adjustments
 2016-09-27 13:47:20 +02:00
ExcessiveUseOfCobblestoneandAnturK 9d54b28e9b Fixes Intellicard view-locking bug (#20682) 
* Update ai_core.dm

* Update ai.dm

* Update mecha.dm

* Update mecha.dm

* Update mecha.dm

* Update ai_core.dm

* Update ai.dm

* Update ai_core.dm

* Update ai.dm

* Update ai_core.dm
 2016-09-27 13:40:45 +02:00
Jordie0608 7a97ac7bdc getrev wrong var patch 2016-09-27 19:01:14 +10:00
Cuboos 8bcffdd908 OKAY IT WILL WORK THIS TIME I HOPE OH GOD HELP ME 2016-09-26 21:23:51 -07:00
XDTMandKorPhaeron 9809c32b22 Use freon (#20664) 2016-09-26 22:26:21 -05:00
Kyle Spier-SwensonandGitHub 9c67747b93 Round end will now pre-load the admin selected round end sound to clients 2016-09-26 05:36:53 -07:00
orangesandAnturK 5581fd9c72 Fix simple mobs spawning into nullspace + helper for spawning atoms (#20669) 
Fixes badminbomb cores and spawner grenades starting out mobs in
nullspace, also adds a helper proc to do spawning
 2016-09-26 08:47:03 +02:00
Joan LungandAnturK af137debfb Fixes drakes not throwing people clear when they swoop into them (#20665) 
* Fixes drakes not throwing people clear when they swoop into them

* how do i fuck up spans without yooooooou
 2016-09-26 08:44:38 +02:00
oranges df3f2db7ea Make say handling short out earlier to prevent runtimes 
The code does not appear to expect a message of the form "", but
does not carry out the check for a message until much later
 2016-09-26 06:20:40 +00:00
oranges 464f1a2763 Prevent the user selecting jobs before the job list has been intialised 2016-09-26 06:02:51 +00:00
Incoming 418d45fa9d Fixes weird limb updating bug where once a limb became no_update it could never properly update again 2016-09-26 00:48:32 -04:00
KorPhaeron a5f762084d Shielded Hardsuit Fix 2016-09-25 21:50:25 -05:00
TheCarlSaganExpressandoranges 7e1331bc04 PDA Adjustments (#20637) 
* Adjustments to the PDA. Ejecting a cartridge from the PDA no longer falls to the ground.

* Requested Changes
 2016-09-26 14:57:30 +13:00