cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-16 03:56:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,849 Commits 61 Branches 14 Tags
210eedbb4886e296fc4eac57ff81fb100aeabb57
Commit Graph

1421 Commits

Author SHA1 Message Date
Swag McYolosteinen
65f0e36eeb Merge pull request #8942 from AnturK/martialfixes 
Martial art fixes
 2015-04-15 13:02:23 +02:00
AnturK
cad52e1672 - Fixes temporary martial styles becoming permanent 2015-04-14 13:26:12 +02:00
AnturK
9048a5fca1 - Fixes suplex logging 2015-04-14 08:47:02 +02:00
AnturK
9ee88e7c4a - Fixes scroll usage 
- Fixes wrestling belt name
 2015-04-14 01:14:18 +02:00
Xhuis
7b5760f6d3 Merge remote-tracking branch 'remotes/upstream/master' into shadowling_1 2015-04-13 16:47:00 -04:00
Xhuis
9c752683ef Shadowling update one 2015-04-13 16:46:49 -04:00
Remie Richards
3a7a300081 Merge pull request #8155 from AnturK/abduction 
Abduction Gamemode [Ready]
 2015-04-13 18:06:55 +01:00
AnturK
6fa8e5f02d Adds Abduction Mode 2015-04-13 18:40:15 +02:00
Cheridan
8123093880 Merge pull request #8918 from MrPerson/ie_modern 
Make DS's IE browser use the most modern available instead of IE7
 2015-04-13 09:35:03 -05:00
AnturK
6eef1ddf16 Fixes #8941 2015-04-13 15:57:06 +02:00
Jordie
cba7fe8a28 Merge pull request #8900 from Ikarrus/ganguplink 
Set list of uplink-purchasable items for Gang Mode
 2015-04-13 18:24:35 +10:00
Jordie
d8ef9ecb44 Merge pull request #8777 from CosmicScientist/SpaceCarpTatorItem 
Adds space carp traitor item and carp plushie "attack"
 2015-04-13 18:22:53 +10:00
Jordie
e6143f6493 Merge pull request #8810 from AnturK/everybodywaskungfufighting 
Adds martial art datum and three styles
 2015-04-13 18:22:37 +10:00
Jordie
becdb6fcc3 Merge pull request #8746 from ACCount12/diseasesfixes 
Fixes for DNA spread and transformation diseases
 2015-04-13 18:22:21 +10:00
Jordie
ae120db87c Merge pull request #8728 from AnturK/action_button 
Generic Action\Action Button System
 2015-04-13 18:22:08 +10:00
MrPerson
d315b64585 Make DS's IE browser use the most modern available instead of IE7 
Read this for more info http://www.byond.com/forum/?post=1820325
Assuming the user has a modern version of IE installed, this allows access to supported CSS 3 elements that we currently can't use. Visually everything seems to remain the same.
Tried doing this with nano and it stopped working for me. Since I know jack all about how nano works, it stays as-is for now.
 2015-04-12 07:25:28 -07:00
CosmicScientist
6f357b1d63 Merge branch 'master' of https://github.com/tgstation/-tg-station into SpaceCarpTatorItem 2015-04-11 22:11:10 +01:00
Ikarrus
71d529a6a5 More adjustments 
- added unrestricted-use guns
- excluded fake toy guns
- Unexcluded throwing stars
 2015-04-11 14:37:21 -06:00
Ikarrus
6f3a9ab68a Unexcluded surplus crates 2015-04-11 13:04:13 -06:00
Ikarrus
398f75f035 Custom list of uplink-purchasable items for Gang 
This excludes certain uplink items that can be purchased during gang mode. Most notably emags (OP with borgs), space suits (No hiding), chameleon projector (No hiding), the singularity beacon and certain spy-like weapons (Not appropriate).
But this also allows gang bosses to purchase items that were formerly only available to nuke ops, such as their weapons.
 2015-04-11 12:57:15 -06:00
Xhuis
6375286704 Fixes admin shadowlings not getting Enthrall 2015-04-11 14:57:14 -04:00
Swag McYolosteinen
853009f7e0 Merge pull request #8157 from Xhuis/shadowling_gamemode 
Shadowling (MERGE-READY!!)
 2015-04-11 17:51:23 +02:00
Xhuis
c9338f7212 Shadowling: RELEASE EDITION 2015-04-11 11:42:02 -04:00
AnturK
f0bc1cc70c - Adds action buttons for aliens 2015-04-11 17:06:44 +02:00
AnturK
e2c869bc77 - Adds generic action and action buttons system 2015-04-11 17:06:43 +02:00
AnturK
260d205598 - Adds Martial Art datum and Three styles 2015-04-11 16:32:20 +02:00
CosmicScientist
bfbc7c40a8 Should be up to date now. 2015-04-11 14:39:37 +01:00
CosmicScientist
0e0f8c4720 Fixed code, carp won't attack owner, corrected spelling. 2015-04-11 03:48:08 +01:00
phil235
4ef5aa93dc Merge branch 'master' of https://github.com/tgstation/-tg-station into FoodRecipes2 
Conflicts:
	icons/obj/food.dmi
 2015-04-09 17:38:14 +02:00
phil235
ddb5ffe324 Merge pull request #8582 from Xhuis/two_devices 
Adds pizza bomb
 2015-04-09 12:58:57 +02:00
phil235
e6e0143ec5 Merge branch 'master' of https://github.com/tgstation/-tg-station into FoodRecipes2 
Conflicts:
	_maps/map_files/MiniStation/MiniStation.dmm
	_maps/map_files/MiniStation/z2.dmm
	code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
 2015-04-08 19:36:49 +02:00
Iamgoofball
c06ad7e6b8 moved process() to datum. made /datum/reagents/ process instead of the containers. 2015-04-07 17:13:59 -07:00
ACCount12
3efb1124ee fix for a fix 2015-04-06 15:55:47 +12:00
CosmicScientist
13060bb6f4 Adds space carp traitor item and fun for carp plushie. 2015-04-06 02:04:16 +01:00
ACCount12
ccbb042606 Fixes for DNA spread and transformation 2015-04-05 09:17:51 +12:00
phil235
f9f618d699 Adding the chemical reactions and recipes for the new recipes. 
Changes the glasses of what? to use an overlay with reagents color.
Adding a ricepack to the kitchen cabinet and the food crate.
Adding more bowl to the dinnerware vending machine.
Adding pumpkinjuice, blumpkingjuice, cherryshake, bluecherryshake pumpkin latte, drunken blumpkin reagents.
 2015-04-04 19:29:12 +02:00
phil235
493c3e038a Splitting food.dmi into smaller files. 
Repathing meat slab, meatsteaks and cutlets into meat/slab, meat/steak, meat/rawcutlet, meat/cutlet. Fixes issue with food naming when containing meat stuff, especially human meat.
Bowl filled with reagent now gets a nice half transparent overlay with the reagents colors (like beaker)
Mousedroping a snack that's on a table now opens the tablecrafting window.
Fixes not being to store items in plain bread, plain cake and cheesewheel.
 2015-04-03 21:59:56 +02:00
Xhuis
4377cd6536 Merge branch 'master' into stealthy_weapons 2015-04-02 16:10:37 -04:00
Jordie
475fce8da1 Merge pull request #8639 from Incoming5643/its_time_to_get_hard 
Traitors can now buy blood-red hardsuits for 8 TC
 2015-04-02 20:24:14 +11:00
ACCount12
f10d0df8cf Merge remote-tracking branch 'origin/master' into mining 2015-03-31 18:31:12 +12:00
ACCount12
1c219f0ebe A lot of stuff 2015-03-31 18:30:09 +12:00
Cheridan
6abe8e4f3a Merge pull request #8620 from phil235/RuntimeMutationFix 
Runtime mutation fix
 2015-03-31 00:11:00 -05:00
Incoming
58687cbbd3 Forgot to actually set the path, WHOOPS 2015-03-30 16:28:08 -04:00
Incoming
0b0ea5d9c2 traitors can now buy bloodred hardsuits for 8 TC (normal suits remain 5 TC) 2015-03-30 16:11:53 -04:00
phil235
85ed447129 Fix goon mutations not being initialized somehow... 2015-03-29 22:23:19 +02:00
phil235
c2dec1e970 Fixes runtimes linked to acquiring and losing mutations . 
Moves goon mutations to mutations.dm .
 2015-03-29 17:11:42 +02:00
Jordie
eb5c73500a Merge pull request #8524 from AnturK/bzzt 
Adds Lightning Bolt spell
 2015-03-30 01:21:19 +11:00
phil235
a127c9403a Merge pull request #8553 from GunHog/Helmet_Fix 
Fixes #8541
 2015-03-28 23:35:19 +01:00
Xhuis
d209ce5235 Merge remote-tracking branch 'remotes/upstream/master' into stealthy_weapons 2015-03-28 14:42:31 -04:00
Xhuis
2c988e0aea Adds pizza bomb traitor item 2015-03-28 12:45:05 -04:00