cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-12 18:03:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,350 Commits 61 Branches 14 Tags
957f987b5da2b221de2970cedbbb3866801ac810
Commit Graph

9683 Commits

Author SHA1 Message Date
Cheridan
957f987b5d Merge branch 'master' of https://github.com/tgstation/-tg-station into dragnet 
Conflicts:
	icons/effects/effects.dmi
	icons/obj/items.dmi
 2015-06-22 22:57:53 -05:00
Remie Richards
f5f833ecbb Merge pull request #9971 from KorPhaeron/newfloors 
New Bluespace/Sepia slime reactions, new var for turfs
 2015-06-23 03:43:28 +01:00
Remie Richards
95b2cc2b09 Merge pull request #10092 from TheVekter/dangerwillrobinson 
Danger Update: Meteors, Rods, Flux and Grav
 2015-06-23 03:39:41 +01:00
Remie Richards
4ac8dd2fa6 Merge pull request #10023 from palpatine213/Ifyouwantitdoneright 
Positronic Brain fixes
 2015-06-23 03:39:27 +01:00
TheVekter
ab4a0ade28 fixed the changelog FOR REAL THIS TIME, also fixed bad coding 2015-06-22 21:30:50 -05:00
phil235
3f57259c69 Merge pull request #9466 from Fayrik/TheNanoing 
The Nanoing (Episode 2: The Fix Wars)
 2015-06-22 14:24:20 +02:00
TheVekter
6b5676bd7f Tweaked the meteor screen shake a bit, grav anoms now throw shit, and rods don't gib anymore. 2015-06-22 01:19:12 -05:00
TheVekter
c2157b1a11 * Makes the Flux explosion bigger 
* Causes Immovable Rods to actually bisect the station
* Changes odds for more deadly Meteor Waves
* Fixes that FUCKING TEXT FOR MEATY ORE WAVES
 2015-06-21 20:03:14 -05:00
Razharas
e6b738734a Merge pull request #8876 from xxalpha/fixfixfix 
Cyber Implants + (Pt.2)
 2015-06-21 22:12:17 +03:00
Fayrik
58301912e2 This was way too much work, so this had better work now. 2015-06-21 20:04:16 +01:00
phil235
aa5541070c Merge pull request #10082 from xxalpha/bass 
Fixed not being able to insert a brain into an MMI.
 2015-06-21 19:33:45 +02:00
xxalpha
609d65af58 Fixed surgical step 'saw' not working properly on non humans. 
better
 2015-06-21 18:26:00 +01:00
xxalpha
3379fa5172 Fixed not being able to insert a brain into an MMI. 2015-06-21 17:50:03 +01:00
Cheridan
b1e252c69f Merge pull request #10021 from phil235/AIFloatFix 
Mobs that are anchored or buckled to something anchored no longer float in no gravity.
 2015-06-21 10:45:49 -05:00
Razharas
5532a09764 Merge pull request #10066 from Boggart/adminpmdebugmessagequickfix 
Removes a couple of debug messages from adminpm.
 2015-06-21 12:00:08 +03:00
Cheridan
3da5cfd336 Merge pull request #10047 from Iamgoofball/patch-82 
Removes Morphine Blob
 2015-06-21 01:51:43 -05:00
Boggart
ffbba1eb10 Removes a couple of debug messages from adminpm. 2015-06-20 21:30:14 -06:00
Remie Richards
c79963f7b7 Merge pull request #9792 from GunHog/AI_STOLE_MY_BIKE 
Malf AI module changes + Mechs for normal AIs!
 2015-06-21 00:30:03 +01:00
Remie Richards
ee1e30717a Merge pull request #9980 from LaharlMontogmmery/ContentTransfer 
Container Content Transfer - Good for Review (Again...Again.)
 2015-06-21 00:09:19 +01:00
Cheridan
05f65f04b8 Merge pull request #9866 from Xhuis/revenants 
Revenant Rework (NOW WITH LESS CLOSING)
 2015-06-20 13:24:02 -05:00
Swag McYolosteinen
859c5e66e0 Merge pull request #9930 from duncathan/givinunarysomelovin 
Brings some unary devices closer to the present
 2015-06-20 20:14:02 +02:00
Swag McYolosteinen
7929b7dcd7 Merge pull request #10031 from Ikarrus/gangfashion 
Gang Update: Fashion War Edition
 2015-06-20 18:06:19 +02:00
Cheridan
a2948ba203 Merge pull request #9956 from Jordie0608/whocodesthecodemen 
Various admin improvements
 2015-06-20 00:53:30 -05:00
Cheridan
a45804dcfe Merge pull request #10033 from optimumtact/reeeeeeee_hitby_messages 
Hitby messages removed, may help with singularity lag from throwing
 2015-06-20 00:19:03 -05:00
Cheridan
f5525749ce Merge pull request #10027 from phil235/StraightJacketBuckleResistFix 
Fixes being able to unbuckle yourself while straightjacketed
 2015-06-20 00:07:56 -05:00
Iamgoofball
85975e3d53 Removes Morphine Blob 
the last few times I tried to make this commit I fell asleep for 3 hours accidentally bumping the code
 2015-06-19 22:06:19 -07:00
Cheridan
08f46d5652 Merge pull request #10016 from Ikarrus/iambulletproof 
Buffs bulletproof vests back to 80
 2015-06-19 18:49:02 -05:00
Xhuis
2823a98244 Merge remote-tracking branch 'remotes/upstream/master' into thaw 2015-06-19 11:23:45 -04:00
Swag McYolosteinen
e4281bbaab Merge pull request #10019 from Thunder12345/autoshotgun 
Moved combat shotguns to shotgun/automatic/combat
 2015-06-19 17:06:00 +02:00
Swag McYolosteinen
1dde070d18 Merge pull request #9800 from Dorsisdwarf/wittybranchname 
Buffs nuke ops [merge ready]
 2015-06-19 12:00:23 +02:00
Ikarrus
e27cdc7efe Resolved Conflicts: 
code/game/gamemodes/gang/dominator.dm
 2015-06-18 23:05:51 -06:00
Ikarrus
2605ed586b Reverts dominator sound change 
Dominator sets Delta Alert now
Delta Alert text changed to accommodate this change (+3 squashed commit)

Squashed commit:

[3129c95] Icon state update

[21bddf3] Dominators play the malf sound when activated (until I can find a better alternative).

[2289074] Unfucks changelog (+1 squashed commits)

Squashed commits:

[2289074] Unfucks changelog
 2015-06-18 23:00:04 -06:00
Xhuis
e1356f889e Merge remote-tracking branch 'remotes/upstream/master' into thaw 2015-06-18 23:37:06 -04:00
oranges
ea1df76a6d Hitby messages removed, may help with singularity lag from throwing 2015-06-19 15:32:56 +12:00
Ikarrus
46a5e578e4 Gang Update: Fashion War Edition 
This update primarily deals with gang outfits and expands on how they affect the round.
 2015-06-18 20:01:57 -06:00
palpatine213
9e7c67c6a5 Fixes a check 2015-06-18 14:55:35 -07:00
LaharlMontogmmery
86d0a50776 Revert dump_act and dump_from_storage 2015-06-18 21:21:41 +02:00
Xhuis
ad3f81f88d Custom spawn points and reforming ectoplasm 2015-06-18 13:18:53 -04:00
Thunder12345
1c83cc6d45 Pray pray pray 2015-06-18 18:07:57 +01:00
LaharlMontogmmery
38ab424b8b More OOP! Also preparing the bases for another future PR. 2015-06-18 18:59:04 +02:00
phil235
172ee5ec67 Fixes being able to unbuckle yourself while straightjacketed 2015-06-18 18:41:22 +02:00
Xhuis
bfb66ed518 Some more changes 2015-06-18 12:19:13 -04:00
Cheridan
470f21a752 Merge pull request #10004 from Ikarrus/gangimplants 
Gang Update: Loyalty Implant Edition
 2015-06-18 10:41:15 -05:00
LaharlMontogmmery
373c918a4a Going through some hOOPs - bit of a overhaul. 2015-06-18 17:40:35 +02:00
phil235
e6dcabf245 Merge pull request #9960 from xxalpha/bass 
Put drop_item() calls inside ifs. Replaced some drop_item() with unEq…
 2015-06-18 15:50:35 +02:00
palpatine213
c3170eaae8 Fixes Posibrains removing Traitors from check antags and also being pulled out of posibrains when debrained 2015-06-18 01:28:10 -07:00
Xhuis
08d273e9bd Removes some coffee stains 2015-06-18 00:07:32 -04:00
Xhuis
984ad17613 Merge remote-tracking branch 'remotes/upstream/master' into fuggingRevenants 2015-06-18 00:05:45 -04:00
Xhuis
dd2e262344 A bit more work 2015-06-18 00:02:16 -04:00
Ikarrus
fe14ff46ee - Reduced uzi ammo to 25 influence cost 
- Added uzis to summon guns
- uncapitalized uzi names
 2015-06-17 19:26:02 -06:00