cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-27 07:08:00 +01:00
Code Issues Packages Projects Releases Wiki Activity
35,316 Commits 72 Branches 14 Tags
3af3bd29382cdd67484b9e193128632b9232e85e
Commit Graph
35316 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Core0verloadandoranges 3af3bd2938 R&D machinery refactor (#18295) 
* RnD machinery refactor

* Small changes

* Removed designs selling
 2016-06-08 17:18:22 +12:00
Leoandoranges cf27511dc9 Bar stool FIGHTS (#18325) 2016-06-08 13:29:47 +12:00
tgstation-server b27d5ea38a Automatic changelog generation for PR #18317 [ci skip] 2016-06-07 23:17:40 +00:00
Cruixandoranges 5259e73f4d Fixes changelings readapting while in stasis removing the regenerate verb. (#18317) 2016-06-08 11:17:39 +12:00
tgstation-server c9b9c81f9b Automatic changelog generation for PR #18153 [ci skip] 2016-06-07 23:09:26 +00:00
PKPenguin321andoranges b28da9cb97 Adds emag functions to chem dispensers (#18153) 
* adds emag functions to chem dispensers

* chemical changes, slight code changes

* fixes multiple emagging
 2016-06-08 11:09:25 +12:00
Sawuandoranges dc20a94dd2 SNPC Updates (#18307) 
* SNPC Updates
* SNPCs now use their custom processing by default, with a few tweaks. This is a temporary fix to ensure they work appropriately until @MrStonedOne's MC is in place.
* SNPC custom processing will now watch for a failed loop and restart itself.
* Verb added for debugging SNPCs easily, must be enabled.
* SNPC customization now has three quick options, as well as the original choices.
* Spawns removed from laggier parts of doProcess(), now using waitfor instead
* Security SNPCs will target people set to arrest.
* Chefs, Botanists and Bartenders should now function more appropriately.

* Removes commented code

* Fixes an invalid loop

* REALLY fixes it this time
 2016-06-08 10:32:10 +12:00
oranges c65a4b3bd1 Merge pull request #18312 from MMMiracles/iamagoodcoder 
fixes previously implemented ruins
 2016-06-08 10:30:49 +12:00
oranges 0408ffa9ba Merge pull request #18299 from PKPenguin321/patch-6 
fixes hulks attacking with dual eswords
 2016-06-08 09:11:18 +12:00
oranges e283f14c1c Merge pull request #18305 from MrStonedOne/patch-211 
Fixes ghost images not having byond member iconstates
 2016-06-08 09:10:19 +12:00
oranges 032b5473f8 Merge pull request #18306 from lzimann/lowpopmeme 
Number of nuke ops now scale with population
 2016-06-08 09:09:53 +12:00
tgstation-server d5667e076e Automatic changelog generation for PR #18279 [ci skip] 2016-06-07 21:09:41 +00:00
Joan Lung 61c2d6aee0 Merge pull request #18279 from GunHog/Mining_Borgs_Need_Love_Too 
Mining Cyborg Hyper-Kenetic Accelerator Upgrade
 2016-06-07 17:09:39 -04:00
oranges 0187de935d Merge pull request #18300 from JJRcop/localhost_is_always_admin 
Localhost and .dmbs opened with dreamseeker always get admin
 2016-06-07 22:43:11 +12:00
Kyle Spier-Swensonandoranges 51c317ed02 Remove exception from rule about colon operator (:) 
This isn't needed because typecasting has a lot less overhead than we thought.
 2016-06-07 22:42:35 +12:00
tgstation-server a6924931b2 Automatic changelog generation for PR #18297 [ci skip] 2016-06-07 08:22:53 +00:00
GunHogandoranges 922d6166e7 Thematic Head of Staff ID Computers (#18297) 
- Each of the heads' ID computers are now themed for their department!
 2016-06-07 20:22:51 +12:00
LatDandoranges 25827d6ccb [Ready] Tweaks some R&D levels (#18246) 
Removes tech levels from some traitor objectives. They had tech levels even before the remake but apparently now that the levels got raised that became a problem. Also some small tweaks to other items to make some early levels easier to get.
 2016-06-07 20:18:19 +12:00
sybil-tgstation13 de89461058 Automatic changelog compile, [ci skip] 2016-06-07 05:28:47 +00:00
oranges e06b7d52f2 Merge pull request #18205 from Steelpoint/Vest 
Vest Buff (Vest, Helmet, Warden Hat)
 2016-06-07 16:43:35 +12:00
oranges 636b35bb5e Merge pull request #18291 from coiax/dragon-loot-moved 
Moved dragon loot into necropolis_chests.dm
 2016-06-07 14:59:56 +12:00
Lzimann 6940a45e4a Merge branch 'master' of https://github.com/tgstation/-tg-station into lowpopmeme 
# Conflicts:
#	code/game/gamemodes/nuclear/nuclear.dm
 2016-06-06 23:47:36 -03:00
oranges f338db8c28 Merge pull request #18223 from Incoming5643/patch-11 
The ghost of poly won't interfere directly in the lives of mortals
 2016-06-07 14:42:52 +12:00
oranges c2ffbf42f9 Merge pull request #18284 from KorPhaeron/thisPRagain 
Raises Nuke Min Requirement
 2016-06-07 14:42:38 +12:00
tgstation-server 40c1afd0d5 Automatic changelog generation for PR #18218 [ci skip] 2016-06-07 02:02:54 +00:00
oranges f81634c2eb Merge pull request #18218 from Xhuis/rich_bears 
Fixes and tweaks
 2016-06-07 14:02:53 +12:00
Jack Edge 8cbb10cab2 Moved dragon loot into necropolis_chests.dm 
In addition:
- Added an admin notification when dragon blood causes the dragon
transformation.
- Fixes #18275, lava staff can no longer turn transit tiles to lava.
 2016-06-07 02:57:12 +01:00
oranges a1b0620c5f Merge pull request #18132 from GunHog/Aimed_Spit_For_Mista_Jay 
Aimed Neurotoxin Spit
 2016-06-07 13:54:04 +12:00
GunHog 48ce081d91 Mini fix 
Catches an oversight
 2016-06-06 20:53:19 -05:00
tgstation-server 60426aecbf Automatic changelog generation for PR #17934 [ci skip] 2016-06-07 01:44:01 +00:00
oranges d360479227 Merge pull request #17934 from coiax/bluespace-shelter-templates 
Bluespace shelters use map templates
 2016-06-07 13:43:59 +12:00
Xhuis 38b312c997 Conflicts III 2016-06-06 21:33:28 -04:00
oranges 76ab2582bf Merge pull request #18321 from Cruix/nukeops_war_fix 
[s] Fixes nuke ops being able to fly to the station and then declare war
 2016-06-07 13:32:49 +12:00
Xhuis ab41d85354 Conflicts II 2016-06-06 21:31:38 -04:00
Xhuis 6d84ec3d2a Conflicts I 2016-06-06 21:31:28 -04:00
oranges ef53e135e0 Merge pull request #18266 from MMMiracles/minipickers 
Adds compact pickaxes
 2016-06-07 13:23:26 +12:00
Jack Edge a9b43f06bf Bluespace shelters use templates 
🆑 coiax
rscdel: Bluespace shelter capsules can no longer be used on shuttles.
rscadd: Bluespace shelters may have different capsules stored. View what
your capsule has inside by examining it.
/🆑
 2016-06-07 02:11:35 +01:00
tgstation-server 476bbd4c66 Automatic changelog generation for PR #18264 [ci skip] 2016-06-07 01:08:53 +00:00
oranges c62e2ba11f Merge pull request #18264 from coiax/deathrattles 
Deadchat listeners will hear when people die
 2016-06-07 13:08:52 +12:00
tgstation-server 3274864eb6 Automatic changelog generation for PR #18292 [ci skip] 2016-06-07 01:08:02 +00:00
oranges 78b73b5163 Merge pull request #18292 from ChangelingRain/mercyofRATVAR 
Adds the Clockwork Obelisk, Mania Motor, and Vitality Matrix
 2016-06-07 13:08:01 +12:00
GunHog bfd644231f Merge remote-tracking branch 'remotes/upstream/master' into Aimed_Spit_For_Mista_Jay 
# Conflicts:
#	code/modules/mob/living/living_defines.dm
#	icons/mob/actions.dmi
 2016-06-06 20:05:23 -05:00
oranges 017cd65250 Merge pull request #18047 from kevinz000/embraceTheMemes 
Reactive Table Armor - If you can't beat the memes, embrace them
 2016-06-07 13:03:08 +12:00
PKPenguin321andKorPhaeron d3ba2473cc makes plant analyzers fit in belts again (#18324) 2016-06-06 20:01:51 -05:00
tgstation-server 9897075bff Automatic changelog generation for PR #18197 [ci skip] 2016-06-07 01:01:17 +00:00
oranges 9d6936a607 Merge pull request #18197 from pudl/tank 
adds high-capacity watertanks
 2016-06-07 13:01:16 +12:00
tgstation-server bcf92414d8 Automatic changelog generation for PR #18263 [ci skip] 2016-06-07 00:59:35 +00:00
oranges 2aba5f48ef Merge pull request #18263 from pudl/big-daddy-thicc-dick 
Adds bar stools
 2016-06-07 12:59:34 +12:00
oranges 808c2795cb Merge pull request #18267 from Incoming5643/Vote_Early_Vote_Often 
in game votes now provoke an action button
 2016-06-07 12:58:26 +12:00
oranges 05b4e82e02 Merge pull request #18272 from xxalpha/nukemyshitup 
Syndicate toolbox now has syndicate screwdriver.
 2016-06-07 12:57:44 +12:00