cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-09 16:33:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,385 Commits 60 Branches 14 Tags
fbadb2f22d3bdd0eff21cfcf5edff6d464ed47ce
Commit Graph

20872 Commits

Author SHA1 Message Date
Will Marshall
fbadb2f22d Minor Grammar Fixes 2017-05-20 22:42:18 +01:00
Joan Lung
0fb07d0f5a Proto-kinetic crushers are significantly better (#27379) 2017-05-20 14:41:19 -03:00
Steelpoint
5e45849c5a Pulse Pistol Recharge Addition (#27426) 2017-05-20 10:39:43 -03:00
oranges
be8bcc6c12 Merge pull request #27393 from coiax/annoyed-admirals 
Annoyed admirals recalling shuttles
 2017-05-20 17:13:13 +12:00
Steelpoint
8b2189aa74 Tactical Energy Gun/ERT Sec Officer Change (#27387) 2017-05-20 01:54:06 -03:00
Joan Lung
5ac9cbe758 Merge pull request #27407 from tgstation/lzimann-patch-1 
[s]Paper thing
 2017-05-19 22:34:17 -04:00
Leo
af9af18e68 Merge pull request #27398 from Cyberboss/patch-85 
IsAdminAdvancedProcCall returns FALSE in TESTING
 2017-05-19 17:59:39 -03:00
Steelpoint
75d4b25796 Pulse Weapons Sprite Update (#27386) 2017-05-19 15:51:16 -03:00
Cyberboss
21aa98bea0 Ports folders to Initialize (#27388) 2017-05-19 15:48:12 -03:00
Leo
3cb94572fe Merge pull request #27389 from Cyberboss/patch-87 
Fixes gravity generator admin spam
 2017-05-19 15:47:52 -03:00
Leo
50d4aa58ea min 2017-05-19 14:39:55 -03:00
Joan Lung
9722f0fcf0 Merge pull request #27395 from lzimann/xeno 
Fixes having more movespeed when xenos hug themselves
 2017-05-19 13:31:47 -04:00
swindly
8010794724 Adds modified syringe guns (#27276) 2017-05-19 08:24:37 -03:00
Leo
16a95305ee Merge pull request #27385 from kevinz000/patch-154 
fixes aimed spells not recharging
 2017-05-19 08:20:27 -03:00
Lzimann
88838ce67c Clamp 2017-05-19 08:18:21 -03:00
Leo
08372704d7 Paper thing 2017-05-18 22:23:02 -03:00
4DPlanner
c87e6f85ec Merge remote-tracking branch 'upstream/master' into clubbuff 2017-05-18 21:52:31 +01:00
Cyberboss
3564f0cf85 IsAdminAdvancedProcCall returns FALSE in TESTING 2017-05-18 16:25:32 -04:00
Lzimann
521c67389b Fixes having more movespeed when xenos hug themselves 2017-05-18 14:37:54 -03:00
Jack Edge
2a8e81daed Annoyed admirals recalling shuttles 
🆑 coiax
add: When a shuttle is called, sometimes an on-call admiral, using
availible information to them, will recall the shuttle from Centcom.
/🆑

This is in essence, a simple IC way for admins to recall the shuttle
if they feel that the shuttle should not come. It's up to them entirely,
the system does not trigger otherwise. They also get to set a cranky
message that is automatically fed back to the crew.

It would be nice if admins used their own judgement if the crew is
evacuating for no real reason, and might send an ERT at the same time to
keep the round going? Who knows, I'm just providing the tools.
 2017-05-18 18:09:56 +01:00
kevinz000
16b44c2937 [READY]Peacekeeper cyborg projectile dampening fields, attempt three (#27234) 
* fields

* peaceborg dampeners

* hm

* nerfs recharge

* ...

* fffff

* objectively fields

* kinda_working

* why is this not working

* cheep

* bugfixes, adds to robot

* cross doesn't work ;-;

* on border

* appearance

* hi, is this a refactor?

* ffs

* ree

* monitor

* monitor

* hm

* all good

* Update robot_items.dm
 2017-05-18 10:53:55 -06:00
Iamgoofball
85d770e855 Fixes obtaining blob chems (#27370) 2017-05-18 10:32:43 -06:00
AnturK
7dd00e28ac Fixes bane runtimes (#27368) 
* Fixes bane runtimes

* You're a big typo
 2017-05-18 10:31:08 -06:00
kevinz000
6c0f3433a3 Clowns get an automatic self-recharging pie cannon as a traitor item for 10TC (#27241) 
* Update pneumaticCannon.dm

* Update uplink_item.dm
 2017-05-18 10:27:51 -06:00
Mike Long
0c79d3ff8e Ninja Refactor (#27316) 
* Begins converting Ninjas into the new antagonist datum system.  Does not compile.  Work in progress.

* More work towards datumizing ninjas. Still not finished. Now compiles.

* Adds ninja to traitor panel.

* Add objectives now takes an arg for number of objectives.

* Event now actually ninjas the ninja.

* Ninja suit initialization now works.

* Cleans up the suit initialization code some.

* Suit initialization is now action rather than verb based.

* Now properly adds objectives and memories to the mind upon gaining datum.

* Starts to replace ninja verbs with actions.

* Hooks ninja abilities up to action buttons.

* Whoops, missed a verb.  Gloves are next.

* Adds toggle ineraction type action button.

* Changes icons as per ChanglingRain's suggestions.

* Second round of changes for ChanglingRain

* Replaces sleeps with addtimers.  It's ugly, but more CPU efficient.

* Fixes compile errors.

* Fixes compile error, again.
 2017-05-18 10:21:26 -06:00
Cyberboss
9721a38b13 Fixes gravity generator admin spam 2017-05-18 10:44:43 -04:00
Cyberboss
ee404b2170 World.dm Refactor (#27268) 
* Cleanup world/New

* Moves some things from OnReboot SS Shutdowns

* Move mode handling procs to ticker

* Moves delayed reboot to ticker
Cleans up round end sound setting
Splits round end animation between SStitle and SSticker

* Moves PR announcement to where it can use the define

* Clean this bit up

* Move out datacore Initialization

* Fix some stuff

* Fix this for

* Different PR

* Gives admins reboot options

* Make it smaller
 2017-05-18 21:53:46 +10:00
QualityVan
9abe8f88ce Fixes custom slices not inheriting name (#27343) 2017-05-18 09:51:37 +02:00
WJohn
d442e86623 Gives lavaland syndicates the syndicate faction. (#27335) 
* Gives lavaland syndicates the syndicate faction.

* Makes the faction a list. Whoops.
 2017-05-18 09:50:20 +02:00
kevinz000
659a5c520f Update aimed.dm 2017-05-17 23:39:44 -07:00
Joan Lung
1b7c4a63dc Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual (#27344) 2017-05-17 22:54:54 -05:00
Joan Lung
074727555d Merge pull request #26677 from coiax/codespeak 
Codespeak language and manual
 2017-05-17 22:04:16 -04:00
Jack Edge
aab0e3ad19 STatic lists 2017-05-17 21:53:30 +01:00
Razharas
c152ca21d4 Slight improvement 
Slight improvement
 2017-05-17 23:31:26 +03:00
Razharas
4826b55686 Merge branch 'anti-transit-vines' of https://github.com/coiax/-tg-station into coiax-anti-transit-vines 2017-05-17 23:23:14 +03:00
4DPlanner
1270c10082 Hierophant boss deals double damage to intruders 2017-05-17 17:50:24 +01:00
4DPlanner
b840d5d551 Nerfs melee damage 2017-05-17 17:07:15 +01:00
4DPlanner
586ec27ac3 Damage is now consistent across lavaland and non-lavaland mobs, and 
teleport never friendly fires
 2017-05-17 17:05:52 +01:00
4DPlanner
6d756c3dc4 Removes accidental paste nonsense 2017-05-17 16:47:31 +01:00
4DPlanner
07768b376f Buffs hierophant club 2017-05-17 16:36:22 +01:00
oranges
c7541703c0 Merge pull request #27321 from francinum/patch-1 
Fixes spelling on the EM Pulse action
 2017-05-17 22:00:51 +12:00
oranges
30ebadece8 Merge pull request #27302 from coiax/copy-languages-proc 
Adds a proc for copying languages from another thing
 2017-05-17 21:57:51 +12:00
Joan Lung
648e83f481 Adds framework for cult constructs having the ability to make runes (#27266) 2017-05-16 20:13:35 -03:00
Expletive
810bb90b28 Adds a really stupid syndicate bible, with a great sprite by JStheguy (#27192) 
Syndicate Tomes have been added to traitor uplinks for 9 TC. They let an agent or an operative provide both weal and woe.
 2017-05-16 16:54:00 -03:00
fludd12
b465361a6d Adds Bonfire Grills (#27250) 2017-05-16 11:27:08 -03:00
QualityVan
b27665d293 Adjusts ear/eye protection based on missing organs (#27291) 2017-05-16 09:07:35 +02:00
Robustin
3f47e55fe1 Cult 2017 Overhaul 1.5: The End - Been finished for 5 days edition (#27085) 
* Chosen Harvesters

* Update runes.dm

* New Cult Ending

* New Cult Ending

* Cinematics added

* A couple fixes

* Update ticker.dm

* Final Touches

* Done

* Desc fix

* Update alert.dm

* Update cult_comms.dm

* requested changes

* Update uplink_item.dm

* Update alert.dm

* Update runes.dm

* Update runes.dm

* fuckinglaunchpad

* Update machine_designs.dm

* Fucking launchpad errors

* Update narsie.dm

* Update mode.txt

* moves a few pixels on the sprite for Joan

* whatever just merge it

* You know whats BS?

* While you're at it... merge this shit

* Update living_defense.dm

* Update constructs.dm

* Update living_defense.dm
 2017-05-16 08:50:46 +02:00
francinum
a6cca447fd Fixes spelling on the EM Pulse action 
PUlse >> Pulse
 2017-05-15 20:12:59 -04:00
oranges
1633062837 Merge pull request #27214 from FantasticFwoosh/Starthistle 
Updates starthistle plant description & stats, adds a seed return harvest, fixes sprites & adds starthistle seeds to the botany vendor contraband
 2017-05-16 10:03:55 +12:00
Jack Edge
71feeed1db Backwards istype 2017-05-15 20:07:42 +01:00