cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-19 05:26:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,922 Commits 61 Branches 14 Tags
fbe0cd2bb7db6e79c42dbf50666ef544dc3da2c8
Commit Graph

1589 Commits

Author SHA1 Message Date
Jordie
fbe0cd2bb7 Merge pull request #10401 from Ikarrus/ganglastfixedition 
Gang Update: Last Refactor Bug Edition
 2015-07-06 14:58:45 +10:00
Ikarrus
792720848d - Reverted the change that made the traitor panel even harder to read 
- Fixed a runtime with observers during pregame
 2015-07-05 20:51:32 -06:00
Ikarrus
737783b084 Update 2015-07-05 00:32:13 -06:00
Razharas
b42aa8238f Merge pull request #9816 from Sabbat/SabbatArmorRune 
Armor rune updated to allow multiple choices based on what you are we…
 2015-07-05 05:48:58 +03:00
Razharas
60a5a83757 Merge branch 'master' of https://github.com/tgstation/-tg-station into ChamFix 2015-07-04 22:31:18 +03:00
Razharas
38c2a54d9d Replaces magic number with define 
Replaces magic number with define
 2015-07-04 22:30:46 +03:00
Swag McYolosteinen
4d3d4be753 Merge pull request #10353 from Ricotez/catfix 
FIX for randomly spawning with cat parts.
 2015-07-04 16:58:56 +02:00
Ricotez
4d91dbb9f0 Adds adminlogging for Toggle Purrbation. 2015-07-03 22:48:34 +02:00
Ikarrus
97b8286a00 Fixes some bugs introduced by Datum Gangs 
- Fixes Quick-Create Gang button
- Fixes bosses unable to promote lieutenants
 2015-07-03 12:37:52 -06:00
Cheridan
7b6867bc21 Merge pull request #10328 from Ikarrus/datumgangs 
Datum-Based Gangs [Ready]
 2015-07-03 10:35:07 -05:00
Razharas
b1bf4d04fe Merge pull request #10209 from Ricotez/human_mutantparts 
Gives humans two types of mutant accessories: ears and (human-specific) tails.
 2015-07-03 08:36:36 +03:00
Ikarrus
3814dc208a Gang-Based Datums 2015-07-02 22:18:11 -06:00
Razharas
572121ecc4 Merge pull request #10244 from Ikarrus/workplacesafety 
Workplace "Accidents"
 2015-07-03 05:05:36 +03:00
Ikarrus
25b134581b Resolved Conflicts: 
code/game/gamemodes/gang/gang_pen.dm
 2015-07-02 15:15:41 -06:00
Ikarrus
2191a2c33d Datum-Based Gangs 2015-07-02 15:12:55 -06:00
xxalpha
a405a14ab7 More better. 
Some cleaning
 2015-07-02 21:30:03 +01:00
xxalpha
4a86be4883 Merge remote-tracking branch 'upstream/master' into boxesofbananium 
Conflicts:
	code/game/objects/items/stacks/sheets/mineral.dm
 2015-07-02 18:49:41 +01:00
xxalpha
b2349384da Removed shit loop, fixed autolathe interface, removed debug msg. 2015-07-02 18:44:39 +01:00
xxalpha
6ad41f96c0 Code uses harden 2015-07-02 01:14:35 +01:00
xxalpha
9f0a0f1427 Changed filename 2015-07-01 21:28:35 +01:00
xxalpha
e8313287fe Less for loops, more direct references. 2015-07-01 21:17:53 +01:00
Ikarrus
55bec2d24d Adds a thrownby var that's used by admin logging. 2015-07-01 13:00:12 -06:00
xxalpha
cbf041c054 MATERIAL DATUM 2015-07-01 18:32:30 +01:00
xxalpha
cfb5e724b6 Material container, all items can have materials, wake me up 
cant wake up

go to sleep debug
 2015-07-01 03:34:47 +01:00
Ricotez
acd297e7f5 -Added new option to the VV menu drop-down list: Toggle Purrbation. 
-Putting a human on purrbation gives them cat ears and a cat tail, and sends them the message 'You suddenly feel valid.'
-Removing a human from purrbation reverses the effects, and sends them the message 'You suddenly don't feel valid anymore.'
-Renamed "Long and Smooth" tail to "Cat" tail. I wasn't kitten anyone with the old name.
-Updated changelog.
Forgot to include these two in the last commit:
-Cat ears and tail now use your hair colour instead of your mutant colour.
-Added changelog.
 2015-06-30 20:17:55 +02:00
Cheridan
cd01bdee8b Revert "Makes N2O an effective oxidizer" 2015-06-30 11:18:53 -05:00
Cheridan
0216335cb4 Merge pull request #9987 from as334/atmos 
Makes N2O an effective oxidizer
 2015-06-30 16:17:54 -05:00
phil235
782fdd7678 Merge pull request #10259 from Razharas/DemonFix 
Fixes dummy objects being rightclick visible
 2015-06-30 23:04:30 +02:00
Cheridan
3b4dbc4f27 Merge pull request #10216 from nukeop/syndiesurgerybag 
Add Syndicate surgery bag to uplink
 2015-06-29 15:52:55 -05:00
Razharas
8a26ff2527 Fixes dummy objects being rightclick visible 
Fixes dummy objects being rightclick visible
 2015-06-29 15:38:39 +03:00
Razharas
182e11430d Fixes chameleon mutation 
Fixes chameleon mutation
 2015-06-29 14:21:06 +03:00
Razharas
eb4d6c66a5 Merge branch 'master' of https://github.com/tgstation/-tg-station into VarEdit 2015-06-29 13:42:23 +03:00
Ikarrus
cbee684951 Macro/Micro bombs are now restricted to the Nuclear game mode. 
Also fixes some broken spans.
 2015-06-28 09:57:24 -06:00
Razharas
acca364c50 Merge pull request #10191 from Xhuis/thoseDogsAreSleepingByTheWay 
Gang Fighting Styles
 2015-06-28 17:22:38 +03:00
phil235
e8d3deafab Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidFix 
Conflicts:
	code/modules/clothing/masks/gasmask.dm
 2015-06-28 15:22:21 +02:00
Razharas
98c2bd18db Merge pull request #9620 from xxalpha/mineralcontainer 
Fixed banana shoes mineral handling.
 2015-06-28 15:07:17 +03:00
barackobama
0316a836cb add a Syndicate surgery dufflebag full of tools to the uplink 
add a Syndicate MMI that lets traitors create subverted cyborgs (not
slaved and with emag laws) - this is included with the surgery bag
 2015-06-28 02:54:49 +01:00
Razharas
119c4d7929 Merge pull request #10186 from Anonus/m(i/a)crobombs 
M(i/a)crobomb Adjustments
 2015-06-28 00:19:06 +03:00
Xhuis
352500d341 Sprites bo staff, adds custom martial art 2015-06-27 15:32:54 -04:00
Razharas
3d556ea970 Some varedit improvements 
Fixed give spell window hiding most important part of the spell types
Added call proc to varedit so all things you can open in varedit you can
also call procs on
 2015-06-27 18:00:57 +03:00
Xhuis
c5a47adb64 Fighting Styles, 1 2015-06-26 14:19:52 -04:00
Cheridan
8c9169f9a8 Merge pull request #10144 from phil235/StimulantsBuff 
Buffs stimulants reagent.
 2015-06-26 10:37:46 -05:00
Anonus
d85a612ee8 Microbombs to 2 TC 
So that traitors don't get to have maxcap for 12 TC
 2015-06-26 11:37:33 -04:00
Razharas
90a6a8ca96 Revert "Revert "MERGE THIS RIGHT FUCKING NOW I DON'T CARE ABOUT TRAVIS"" 2015-06-26 02:45:02 +03:00
Razharas
97aaa5fb8d Revert "Revert "Microbombs and Macrobombs, Nuke Ops start with Microbombs onc…" 2015-06-26 02:44:20 +03:00
Razharas
69d6cd4f94 Revert "Microbombs and Macrobombs, Nuke Ops start with Microbombs once more" 2015-06-26 02:16:02 +03:00
Razharas
a40697c545 Revert "MERGE THIS RIGHT FUCKING NOW I DON'T CARE ABOUT TRAVIS" 2015-06-26 02:12:29 +03:00
Iamgoofball
f45127b03c MERGE THIS RIGHT FUCKING NOW I DON'T CARE ABOUT TRAVIS 
how did I not notice this AAAAAAAAAAA
 2015-06-25 15:28:57 -07:00
phil235
031a98d14c Merge pull request #9836 from AnturK/viral 
Makes viruses varedit friendly
 2015-06-25 14:09:50 +02:00
Razharas
454dc14b44 Merge pull request #10117 from Iamgoofball/explosive_implant 
Microbombs and Macrobombs, Nuke Ops start with Microbombs once more
 2015-06-25 12:49:03 +03:00