cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-20 22:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,020 Commits 61 Branches 14 Tags
f800987765b1c48c4e63f027162e0df9828abbb5
Commit Graph

38020 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
oranges
f800987765 Merge pull request #20083 from PKPenguin321/explosive-tesla 
[READY] Explosive Tesla, Take 2
 2016-08-28 12:42:22 +12:00
oranges
0c95041d5b Merge pull request #20106 from Shadowlight213/interactfixes 
Tweaks to admin ai interact
 2016-08-28 12:38:39 +12:00
oranges
5aa96750b9 Merge pull request #20102 from Shadowlight213/retryingin30secondsretryingin30secondsretryingin30seconds 
Fixes the ghost role spawn infinite loop.
 2016-08-28 12:38:25 +12:00
oranges
251848232f Merge pull request #20100 from GunHog/Colony_Drop_Fixes 
More Mining Base Tweaks
 2016-08-28 12:38:12 +12:00
oranges
99b66fcfc9 Merge pull request #20092 from Jordie0608/byondtreatstheZanchordifferentlyandimnotsureifitsabugornot 
Fixes commit listing in show-server-revision when multi-testmerging
 2016-08-28 12:37:23 +12:00
tgstation-server
3d45acd729 Automatic changelog generation for PR #20099 [ci skip] 2016-08-28 00:37:16 +00:00
oranges
ced523874c Merge pull request #20099 from ChangelingRain/ayesgivenlikeitsallsomeonecansaylikeitstheonlyoptionisjustasbadasgoingonwhentheysayno 
The staff of lava can now turn lava back into basalt
 2016-08-28 12:37:14 +12:00
tgstation-server
bc32534365 Automatic changelog generation for PR #20149 [ci skip] 2016-08-28 00:29:21 +00:00
Incoming5643
09683bac79 adds the gender change potion as the blood reaction of pink slimes (pink slimes previously only had one reaction, and it's not exactly a barnburner). (#20149) 
This item changes up the gender var of any gendered mob/living. Including people. There are a few interesting applications of this item, mostly if your into animal husbandry (all generic animals unless programed otherwise are all the same gender) but mostly it's just here to fill the immensely niche gap the loss of gender reassignment surgery left. Also it's 2:30 am.

Also factors out the old human var gender_ambiguous, as that surgery was the only way to ever trigger it.
 2016-08-27 19:29:20 -05:00
PKPenguin321
a8f893d343 fixes runtime with grav gen 2016-08-27 15:38:44 -07:00
PKPenguin321
58f43daee3 makes nuke and grav gen properly destroy when zapped 2016-08-27 15:20:25 -07:00
tgstation-server
a1ef223076 Automatic changelog generation for PR #20111 [ci skip] 2016-08-27 21:56:29 +00:00
pubby
6f11a12e13 Replaces standard borg sheet snatcher with mining scanner. (#20111) 2016-08-27 16:56:28 -05:00
Incoming5643
424d450dbc Makes the "nothing happened!" option of drake's blood vaguely more entertaining/frustrating (#20144) 
* Makes the "nothing happened!" option of drake's blood vaguely more entertaining by turning those who hit it into a lizardperson approximating the appearance of an ash drake.

* changed the colors to a suggestion of @ChangelingRain
 2016-08-27 16:55:59 -05:00
tgstation-server
2d33f93dab Automatic changelog generation for PR #20158 [ci skip] 2016-08-27 21:47:41 +00:00
WJohn
23f9058763 Updates Lava Sprites (#20158) 2016-08-27 16:47:39 -05:00
PKPenguin321
08ecbf63ee fixes grilles exploding machines 2016-08-27 13:37:28 -07:00
tgstation-server
de933b6797 Automatic changelog generation for PR #20109 [ci skip] 2016-08-27 18:50:52 +00:00
Shadowlight213
987333db96 Adds a config option to use account creation age for job timers. (#20109) 2016-08-27 13:50:51 -05:00
Core0verload
3b188fd41f One Liner Fix (#20098) 2016-08-27 10:34:22 -05:00
NikNakFlak
7bf6e01cf2 Goof has nothingo on me (#20110) 2016-08-27 10:27:47 -05:00
xxalpha
9c7ece1faf Swapped SortAreas with process_teleport_locs in world/New (#20131) 2016-08-27 10:26:07 -05:00
tgstation-server
bd9513651f Automatic changelog generation for PR #20128 [ci skip] 2016-08-27 15:24:17 +00:00
Core0verload
b888717c50 You can now use sheets from any hand, not just the active one (#20128) 2016-08-27 10:24:15 -05:00
TechnoAlchemist
2bd109ce73 Gives extradimensional chap weapon a unique gimmick. (#20112) 
* Gives extradimensional chap weapon a unique gimmick.

* index on Its_balanced_tm: 29dd689 Gives extradimensional chap weapon a unique gimmick.

* Makes my ""code"" less shit.
 2016-08-27 10:00:36 -05:00
Cheridan
84480dafdf Merge pull request #20018 from Iamgoofball/revert-19952-a 
Revert "Temporarily removes stock computers (#GoofFixYourShit)"
 2016-08-27 03:04:47 -05:00
Jordie
4e9c809689 Create goof-is-a-nerd.yml 2016-08-27 15:53:33 +10:00
Iamgoofball
f04ccfddea [s] I give up and rename it to what it actually does (#20148) 
* [s] stops bans

* My Immortal, the entire Baneposting script, Bee Movie, Inside Out script, and then WGW for good measure in a commit message
 2016-08-27 00:32:20 -05:00
Cheridan
9b6c45a228 Merge pull request #20118 from ChangelingRain/honorinthecastingofthebonesasecretmutualtrustthatprophecywillbetruthfulabondintheflipofacard 
Fixes the survival pod sleeper totally hiding the floor under it
 2016-08-26 23:56:37 -05:00
Jordie
f9c3492e6e Merge pull request #20103 from Shadowlight213/radstormfixes 
A couple of radstorm fixes.
 2016-08-27 13:47:49 +10:00
Shadowlight213
1765e66e89 abort and refund 2016-08-26 18:18:11 -07:00
jughu
36a1cf3be1 Ayy (#20140) 2016-08-26 16:28:54 -05:00
Shadowlight213
e54b42b3b9 Increases total attempts to 3. 
Doubles the wait time between each attempt
 2016-08-26 13:40:25 -07:00
Joan Lung
61cd5ab291 Merge pull request #20096 from Jalleo/Processor 
Resolves the code for food processors and slime processors + minor fixes
 2016-08-26 10:18:50 -04:00
blah
9471623237 Does the change that Joan requested 2016-08-26 15:11:14 +01:00
Kyle Spier-Swenson
26f293a296 [s]fixes qdel lag from computers in chasms (#20127) 
* fixes qdel lag from computers in chasms

* Update computer.dm
 2016-08-26 18:59:43 +12:00
Jordie0608
cda1f7939d fixes regex commit? 2016-08-26 15:46:39 +10:00
Shadowlight213
3ff6886189 Fixes infinite stun and collapse spam 2016-08-25 21:58:23 -07:00
Leo
17ecd06950 Changes the ash drake armour on crafting recipe to match the actual item (#20122) 2016-08-25 23:56:32 -05:00
tgstation-server
96e56e5966 Automatic changelog generation for PR #20073 [ci skip] 2016-08-26 04:43:58 +00:00
Iamgoofball
6fa26584cf Ups the player and station name length limits (#20073) 
* Ups the player and station name length limits

I think they could use a buff in length, as I've seen captains have pretty creative names get cut in half and the joke ruined, and the name limit is really fucking small like come on goddamn

* changes
 2016-08-26 16:43:56 +12:00
tgstation-server
f4e5ec15a3 Automatic changelog generation for PR #20069 [ci skip] 2016-08-26 02:13:57 +00:00
xxalpha
d7a5fa307a Cigarette packs immersion buff (#20069) 
* Cigarette packs immersion buff.

* Changed code that did not work as intended
 2016-08-26 14:13:56 +12:00
Supermichael777
2c37920f60 Adds a discription for triple citrus (#20090) 
* Adds a discription for triple citrus

along with a placeholder sprite

* Add files via upload

* Add files via upload

* need to replace

* with thiss

* and implment
 2016-08-26 14:13:25 +12:00
Joan Lung
52ba13fbdf Remove xenobio's free antag (#20081) 2016-08-26 14:12:29 +12:00
tgstation-server
515bdf38b5 Automatic changelog generation for PR #20084 [ci skip] 2016-08-26 02:12:08 +00:00
PKPenguin321
11a500d3b7 makes people get hurt when thrown at each other (#20084) 
* makes people get hurt when thrown at each other

* why the space indeed
 2016-08-26 14:12:06 +12:00
tgstation-server
d309ae6753 Automatic changelog generation for PR #20077 [ci skip] 2016-08-26 02:11:22 +00:00
Joan Lung
5188bc7a69 Fixes AI bumping (#20077) 2016-08-26 14:11:20 +12:00
Joan Lung
acea55e5a9 Fixes the survival pod sleeper totally hiding the floor under it 2016-08-25 20:40:45 -04:00