cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-26 09:03:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,547 Commits 61 Branches 14 Tags
dcb8f18ea911df2d6b4d8a841bdcbef58dbc352f
Commit Graph

477 Commits

Author SHA1 Message Date
MrStonedOne
b50e8d2a63 removes a bunch of unneeded spawns 
spawns have a high overhead.

I only went for easy targets, almost every spawn could be removed with a few subsystems in place to handle delays or cooldowns
 2016-01-02 18:23:02 -08:00
tkdrg
e5941a59a2 Merge pull request #14124 from KorPhaeron/darkness 
Advanced Darkness (wizard event)
 2016-01-01 00:51:55 -03:00
KorPhaeron
b9bf6ef547 Advanced Darkness 2015-12-31 19:32:02 -06:00
tkdrg
52a45b6292 Merge pull request #12935 from AndrewJacksonThe2nd/objectives_rework 
OBJECTIVES REWORK: Better Objectives Generation
 2015-12-31 03:11:41 -03:00
tkdrg
e57b43276d Merge pull request #14134 from GunHog/In_This_Episode_Gun_Hog_Teaches_MATH! 
Fixes Abductor event
 2015-12-29 22:51:17 -03:00
GunHog
834242b808 Fixes Abductor event 
18,0000 deciseconds = 300 minutes, not 30!
 2015-12-28 20:08:26 -06:00
KorPhaeron
9cf6a315b7 Advanced Darkness 2015-12-28 15:25:42 -06:00
AndrewJacksonThe2nd
dca91323a4 Merge branch 'master' of https://github.com/tgstation/-tg-station into objectives_rework 
Conflicts:
	code/datums/mind.dm
	code/game/gamemodes/antag_spawner.dm
	code/game/gamemodes/objective.dm
	data/mode.txt
 2015-12-28 12:40:51 -08:00
KorPhaeron
15d4ad156c Final (I hope) weather tweaks 2015-12-24 23:03:32 -06:00
KorPhaeron
70060cb6c1 Weather datums 2015-12-22 05:31:46 -06:00
tkdrg
ef415278aa Merge pull request #13830 from Incoming5643/nothing_ever_works_right_away_its_just_the_way_things_are 
Unbricks the rpgloot event
 2015-12-21 12:14:36 -03:00
Incoming5643
72a5c2d604 why am I editing in the browser this is terrible 2015-12-21 01:11:29 -05:00
Incoming5643
cda01d1457 he's right 2015-12-21 01:10:37 -05:00
Incoming
1e7fcd3e9f unbricks the rpgloot event. 
fixes a rare issue with the imposter event.
 2015-12-20 01:15:03 -05:00
AnturK
b1fe29f73d What is OOP 2015-12-19 15:32:15 +01:00
AnturK
f5a57b5ced Fixes anomalies spawning same place 2015-12-19 15:30:23 +01:00
Cheridan
bc164c9498 Merge pull request #13582 from Incoming5643/Ill_turn_this_game_into_a_shitty_F2P_korean_MMO_yet 
[RPG Loot Intensifies]
 2015-12-13 15:04:53 -06:00
Incoming
4c909afb08 The commit so nice I did it twice 2015-12-11 20:22:10 -05:00
Incoming
fdc87e9324 Replaces the armor bonus with something that should actually work 2015-12-11 20:12:21 -05:00
Incoming
7ce9267a7d The much beloved rpgloot wizard event has been intensified. Modifiers on items can now range between -15 and +15, though items will follow a normal distribution centered around 0. See the PR for exact odds. 
Additionally items armor values are now also affected by this event, and can add (or remove) up to 15 percent damage from all (defend-able) sources.

Additionally a special new gimmick has been added, new "item fortification scrolls" will be thrown randomly into all containers with room to hold them (read: this mostly means things like backpacks). Using these scrolls on items allows you to rank them up one level (this doesn't change their name though, trust me it's too much to do for a silly event).

BEWARE however that using these scrolls on items with very high modifiers (+10 or more) has a chance of failing and setting fire to the item. The highest possible modifier you can achieve with these scrolls is +19, though again the grand majority of items will burn well before this point.
 2015-12-11 19:32:32 -05:00
Cheridan
a5d6d832f8 Merge pull request #13553 from AnturK/cant_say_no_to_probing 
Fixes Abductor event firing up multiple times
 2015-12-11 17:18:46 -06:00
Razharas
7929c027fa Merge pull request #13550 from Incoming5643/new_wizard_meta_just_look_for_the_people_who_arent_fucked_up 
Apprentice clean up / bugfixes
 2015-12-11 22:50:46 +03:00
Razharas
850f8c6792 Merge pull request #13538 from Incoming5643/no_a_blob_didnt_spawn_stop_asking 
Fixes false alarm picking late round exclusive events early
 2015-12-11 22:48:12 +03:00
AnturK
a8ed812584 Fixes Abductor event firing up multiple times 2015-12-10 19:29:10 +01:00
Incoming
6a64864805 formally defines apprentices as a kind of antag instead of as "traitors". 
Wizard events that spare the wizard should now properly spare apprentices too.

Moves renaming as an apprentice to the end of the spawn proc because the input prompt stops various important things (including the sound meant to inform people they got apprentice) from happening until after it's dealt with.

Restores the "+" for positive quality items in RPG loot. The reason this was changed was already fixed, it just was mistakenly never put back.
 2015-12-10 12:08:49 -05:00
Incoming
b376e15830 False alarm will no longer pick events that couldn't have actually happened at that point in the round 2015-12-09 20:52:23 -05:00
duncathan salt
bea8d35ff5 Merge pull request #13437 from neersighted/clickable_stats 
Refactor MC/Failsafe/add Subsystems
 2015-12-07 19:58:46 -06:00
Razharas
13b3f3b923 Some tweaks to vines 2015-12-06 19:47:42 +03:00
Razharas
e5e76ad2a2 Makes explosive vines a bit saner 2015-12-06 18:11:27 +03:00
Bjorn Neergaard
34b717afb4 radio_controller -> SSradio, SSbp -> SSnpc 2015-12-04 22:25:24 -06:00
Remie Richards
b888cb8333 Merge pull request #13427 from Anonus/vineathon2015 
Vine fixes and tweaks
 2015-12-04 21:40:33 +00:00
Nerd Lord
7560562269 Well okay SHORT delay then 2015-12-04 16:32:41 -05:00
paprka
717b857401 Merge branch 'BeamVines' of https://github.com/RemieRichards/-tg-station into remiepls 
Conflicts:
	code/datums/beam.dm
	icons/mob/animal.dmi
	tgstation.dme
 2015-12-03 23:20:12 -08:00
Nerd Lord
a2b8d1eb2a Vine fixes and tweaks. 2015-12-03 15:48:47 -05:00
Incoming
3a85a3777f Spares those in critical from the mass mindshuffle event. 
This was always the intention, but past me made a mistake I know I've made and fixed sense: He assumed that living_mob_list was a list of !stat mobs, when really it was a list of stat != 2 mobs
 2015-12-01 23:05:35 -05:00
Razharas
8f79afd900 Merge pull request #13236 from MrStonedOne/patch-71 
Makes False Alarm only choose events that actually have alarms
 2015-11-29 12:04:21 +03:00
Kyle Spier-Swenson
847b4c8931 Update false_alarm.dm 2015-11-28 02:24:19 -08:00
AnturK
e36853d7c9 Convert bots to simple animals - Updated 7.0 2015-11-26 22:06:07 +01:00
Kyle Spier-Swenson
7dd0f1ad7f I shouldn't code while drunk. 2015-11-26 01:10:06 -08:00
Kyle Spier-Swenson
3d64925e99 fucking event_control vs event datums confusing me 2015-11-26 00:42:30 -08:00
Kyle Spier-Swenson
63d5d82720 False Alarm compile fix 2015-11-26 00:38:02 -08:00
Kyle Spier-Swenson
ddef6bdb68 Makes False Alarm only choose events that actually have alarms 2015-11-26 00:34:46 -08:00
Incoming
1f9f0dfc40 Adds subtypesof(). It's shorthand for typesof(path) - path. 
Replaces typesof(path) - path with subtypesof(path) in obvious places. I was a bit conservative, there's probably a few more places that could use this.
 2015-11-16 18:55:57 -05:00
Cheridan
d7bf779f2d Fixes warning in anomaly_pyro.dm 2015-11-14 00:23:05 -06:00
Nerd Lord
e19757bca3 MY CODE QUALITY IS BASED ON WHAT I'M MESSING WITH 2015-11-11 15:20:48 -05:00
Nerd Lord
f8464b97ef Makes anomalies somewhat more dangerous; hyper-energetic flux anomaly will shock mobs that run into it(or if it runs into them), bluespace anomaly will occasionally teleport mobs away from it in a small radius, vortex anomalies will sometimes throw objects at nearby living mobs, and pyroclastic anomalies will produce MORE FIRE, MORE HEAT, MORE BURNING, and if not disabled, they will burst into flame and the resulting slime will be rabid and thus attack much more aggressively. 
Also fixes a bug where gravitational anomalies were doing if(!target) throw stuff instead of If(target) throw stuff, meaning it'd either do nothing or runtime.

In addition, anomalies move more often, are resistant to explosions and will only be destroyed if they are in devastation range(but why are you bombing it)
 2015-11-11 12:41:07 -05:00
AndrewJacksonThe2nd
eaa1d11af4 On stun_nerf: objectives 2015-11-08 21:10:21 -08:00
Tkdrg
8fce742d0a Merge remote-tracking branch 'upstream/master' into fuk 
Conflicts:
	data/mode.txt
	icons/mob/mob.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/gloves.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/shoes.dmi
	icons/obj/clothing/suits.dmi
 2015-11-07 15:56:39 -03:00
blah
ea40dbdb90 Fixes rpgloot.dm by removing + and - 2015-11-04 16:01:32 +00:00
Remie Richards
d78301b012 Flower bud now inherits from alien/resin structures, so it can be attacked/exploded/blobbed/shot/etc. 2015-11-03 00:11:58 +00:00