cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-28 10:01:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,227 Commits 61 Branches 14 Tags
655f8e107e80a02ec921ba2dffc19604cb919ce7
Commit Graph

16300 Commits

Author SHA1 Message Date
Firecage
655f8e107e Increases power manifestation chance. 2015-05-06 19:26:06 +02:00
Cheridan
dfaf90c79e Merge pull request #9264 from phil235/BundleFix6 
a group of fixes.
 2015-05-04 09:41:01 -05:00
Cheridan
c4a5edd792 Merge pull request #9301 from Incoming5643/damn_your_strange_nontraditional_concept_of_life 
Fixes an instance where bleb wouldn't mulligan properly
 2015-05-04 09:24:45 -05:00
Cheridan
5bbf2be174 Merge pull request #9233 from Firecage/Operatingcuffing 
Allows you to buckle people to an operating table.
 2015-05-04 09:15:41 -05:00
Cheridan
c655462d14 Merge pull request #9292 from Incoming5643/mutations_please 
Fixes a runtime in exotic blood clearing.
 2015-05-04 09:11:05 -05:00
phil235
ba1f186ba4 Merge pull request #9307 from kingofkosmos/ragspanfix 
Fixes span in wiping with rag.
 2015-05-04 13:31:48 +02:00
Cheridan
191e011c14 Merge pull request #9272 from phil235/BundleFix7 
animal knockdown, nettle soup, defib, extinguisher fixes
 2015-05-04 00:26:22 -05:00
Cheridan
78e25c3175 Merge pull request #9220 from RemieRichards/PlasmaaaaaaaMeeeeeeen 
Ports VG's Plasmamen + Species breathing additions
 2015-05-04 00:19:18 -05:00
Cheridan
306af775f3 Merge pull request #9295 from Xhuis/cult_update_un 
Small cult update
 2015-05-03 23:41:16 -05:00
Cheridan
909217b733 Merge pull request #9285 from MrStonedOne/fuck 
Fixes bug preventing pipe construction.
 2015-05-03 21:18:27 -05:00
Remie Richards
e5f034fc0d Merge pull request #9147 from GunHog/Rise_Of_The_RR_Androids 
[Review Ready] Positronic Brains!
 2015-05-03 06:34:02 +01:00
kingofkosmos
4dfee04698 Fixes span in wiping with rag. 2015-05-03 08:11:31 +03:00
Incoming
e84acea13b Fixes an instance where a sanity check was being mistakenly failed because blobs have a different sort of standard for being "alive" or "dead" than other antags. This will fix a problem where blob rounds weren't properly mulliganing. 2015-05-02 21:23:22 -04:00
Xhuis
43bc7260de Cult update 2015-05-02 19:03:32 -04:00
Cheridan
bbb1df2654 Merge pull request #9263 from Incoming5643/fightvale_pride 
Fixes another instance of FIGHTVALE
 2015-05-02 17:46:24 -05:00
Incoming
6a91232fbc fixes a runtime in exotic blood clearing. 
my batting average has been really bad lately. I gotta be more extensive in bug testing.
 2015-05-02 17:29:13 -04:00
MrStonedOne
6d755ba900 Fixes pipe construction bug 2015-05-02 09:07:08 -07:00
Jordie
f0c57b916f Merge pull request #9237 from Firecage/Butchering 
Changes how butchering works, Changes butchering drops
 2015-05-03 00:00:15 +10:00
Jordie
5f4b41c226 Merge pull request #9246 from Wolfie13/9097-borgs-fix 
Fixes #9097
 2015-05-03 00:00:08 +10:00
Jordie
6008404738 Merge pull request #9185 from AnturK/aliens_stole_my_branch_name 
Abduction Update 2.5
 2015-05-02 23:59:48 +10:00
Jordie
d5c7ead540 Merge pull request #9165 from Xhuis/REMOVE_REVENANT_remove_revenant 
Temporarily disables revenants
 2015-05-02 23:59:36 +10:00
Jordie
3606662c88 Merge pull request #9106 from phil235/BundleFix5 
Cyborgs, MMIs, and other fixes
 2015-05-02 23:59:22 +10:00
Jordie
562766bdb0 Merge pull request #9129 from Incoming5643/begone_ye_jellies 
Some Mutantrace Housekeeping
 2015-05-02 23:59:15 +10:00
Jordie
840d858aa1 Merge pull request #9202 from xxalpha/igppigigppigigppigigppig 
Fixed surgery closing step not removing bleeding overlay.
 2015-05-02 23:59:06 +10:00
Jordie
d1f55ec69a Merge pull request #9203 from Boggart/RpdUiFix 
Fixes being unable to switch back to the previous pipe type without switching off it and back after using the delete or paint modes.
 2015-05-02 23:58:55 +10:00
Jordie
88faa5f6e9 Merge pull request #9250 from Boggart/BorgsCantIntoDisposalBinDeconstruction 
Fixes borg modules other than the trash bag not being able to work on disposal bins.
 2015-05-02 23:58:39 +10:00
Jordie
865aa7b6fe Merge pull request #9255 from Boggart/ThisIsntTheMushroomKingdomStayOuttaThePipes 
Fixes being able to move out of cryo into the pipes.
 2015-05-02 23:58:28 +10:00
AnturK
34437dffb6 - Makes additional batons cost 2 experiment points. 
- Fixes typo in floors.dmi
- Traitor panel buttons now grant objectives as well
 2015-05-02 12:57:49 +02:00
AnturK
9c1d52a7ae Fixes non-gamemode rounded reports. Also formatting consistent with other modes. 2015-05-02 12:54:56 +02:00
AnturK
d01bd11f47 Update tracking.dm 
Oops
 2015-05-02 12:54:55 +02:00
AnturK
d5c52fab50 Fixes blockTracking variable 2015-05-02 12:54:55 +02:00
AnturK
76717c6a2f Adds some tech levels to the abductor gear 2015-05-02 12:54:54 +02:00
AnturK
1f91bdbda1 Makes the alien floor randomized 
Adds buying spare gear for experiment points
Makes kidnapping all mob/living stuff possible.
 2015-05-02 12:54:53 +02:00
AnturK
0115296a86 Fixes alien table icon 2015-05-02 12:54:53 +02:00
AnturK
a92b3b24e4 - Adds make abductor buttons on traitor panel 
- Fixes clotheless surgery
 2015-05-02 12:54:52 +02:00
MrStonedOne
eb7d5fefa5 Merge remote-tracking branch 'upstream/master' into step-aside-aran-im-here-to-touch-your-precious 
Conflicts:
	code/controllers/subsystem/ticker.dm
 2015-05-02 03:03:29 -07:00
Incoming
9b3f98571c mulligan will no longer mulligan a round into the same mode. Because of how scaling works this would at best only create one or two additional antags. At worst it wouldn't create any antagonists, and mulligan would get frustrated and reroll after its failure. 2015-05-02 00:00:41 -04:00
phil235
be1708483e - Fixed nettle soup recipe says abstract nettle. 
- Fixes hostile animals weakening non carbons, and adjusted weakening values 1958.
- fixes being able to drop defib paddle by resting, fix a runtime linked to this.
- can no longer pick card from deck while resting, same for paper bin and bedsheet bin.
- examining extinguisher and atmos watertank nozzle gives you the amount of water remaining.
 2015-05-02 01:34:38 +02:00
Cheridan
84d2a5a006 Merge pull request #9228 from Ikarrus/pregamedelay 
Admins can now adjust pre-game delay time
 2015-05-01 15:03:26 -05:00
Cheridan
0d1cfba3b7 Merge pull request #9200 from Ikarrus/ERTcodes 
[Z2 MAP] Centcom Response Team Variations
 2015-05-01 14:31:22 -05:00
Cheridan
509d940746 Merge pull request #9225 from Incoming5643/Unless_its_wizbiz_bugs_will_usually_follow 
Fixes Round End Sound
 2015-05-01 14:13:07 -05:00
Cheridan
a68bd99960 Merge pull request #9180 from phil235/GrassSpriteFix 
Fixes broken grass sprite.
 2015-05-01 13:46:59 -05:00
Cheridan
2d021ab175 Merge pull request #9226 from Ikarrus/gang5.2 
Gang Update
 2015-05-01 13:00:51 -05:00
phil235
4a8e168ff3 - admin revive clears addiction list. 8894 
- buffed capsaicin/frost oil temperature effects as well as basilisk temperature effect (to counterbalance the recent change in natural bodytemp stabilization). And slight nerf to ghost chili temp boost when held in hand (for consistency). 8501
- fixes religion name choice window labeled as mime name
- fixes nearly invincible larva 9223
- your health/status now updates immediately after taking damage, we don't wait for the next life(). 7031
- Fixes alien nest overlay not updating when dead mob is gibbed by larva exit. 8523
- fixes flamethrower tablecrafting. 9261
 2015-05-01 19:45:36 +02:00
Incoming
b19a66ba51 Fixes another instance of FIGHTVALE because the replacementmode didn't realize that the lists of antags are kept in the ticker.mode gamemode and not itself. 
Clears up some language issues that was making the check antag panel a little harder to read than it needed to be.
 2015-05-01 13:34:34 -04:00
Cheridan
566861ca62 Merge pull request #9235 from Incoming5643/noncontinuous_extended 
Adds sanity checking for continuous configuration settings
 2015-05-01 12:31:55 -05:00
Cheridan
c947a4bea6 Merge pull request #9221 from Firecage/Grenadelauncherfix 
Fixes the grammar error of the Grenade Launcher.
 2015-05-01 12:17:09 -05:00
Cheridan
9e6b93ae6c Merge pull request #9219 from xxalpha/winter_is_coming 
Fixed unlimited uses crayons not being unlimited.
 2015-05-01 12:01:11 -05:00
phil235
9f8c47b5f6 Removes my changes to cyborgs. 2015-05-01 16:32:34 +02:00
phil235
8f925be840 Merge branch 'master' of https://github.com/tgstation/-tg-station into GrassSpriteFix 
Conflicts:
	code/game/turfs/unsimulated/floor.dm
	icons/turf/floors.dmi
 2015-05-01 16:17:09 +02:00