cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-10 00:43:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,097 Commits 60 Branches 14 Tags
7929c027fa518cba4eab1c5ffbfcda2b2fd3ecd5
Commit Graph

21639 Commits

Author SHA1 Message Date
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
Razharas
a251002d6f Merge pull request #13532 from Jalleo/pAI 
Personal Artificial Intelligence Fix
 2015-12-11 22:46:24 +03:00
Razharas
5b5e48bad8 Merge pull request #13526 from Lo6a4evskiy/ninja-fixes 
Fixes ninja suit not draining energy after running out of it once
 2015-12-11 22:44:55 +03:00
Razharas
550d7779eb Merge pull request #13514 from tkdrg/dadadaDADADA 
Fixes human canUseTopic() misbehaving
 2015-12-11 22:43:36 +03:00
Razharas
83bb88868c Merge pull request #13153 from Jordie0608/arguablyallgunsareenergygunsandallbeamsareprojectiles 
Unifies energy gun self charging
 2015-12-11 22:38:07 +03:00
Remie Richards
767061a163 Merge pull request #13541 from Anonus/prefv 
Fixes revenant antag pref being impossible to toggle.
 2015-12-11 18:15:12 +00:00
Remie Richards
53172fa9ce Merge pull request #13516 from Anonus/whymode 
Fixes up blob code some
 2015-12-11 18:14:56 +00:00
Remie Richards
0ae0f84325 Revert "[s]Fixes the logic of IsBanned and bad CIDs" 2015-12-11 17:49:30 +00:00
Remie Richards
1efcc64990 Fixes the logic of IsBanned and bad CIDs 
the bad CIDs aren't perfectly the Integer max, they're above it.
 2015-12-11 17:27:42 +00:00
Cheridan
de914590fa Merge pull request #13544 from KorPhaeron/survival 
Adds survival capsules to pod safes
 2015-12-11 10:26:04 -06:00
Cheridan
a002ca8917 Merge pull request #13542 from KorPhaeron/gigantic_epipens 
Fixes small objects covering the entire tile after a fire
 2015-12-11 07:23:00 -06:00
Cheridan
41709c7016 Merge pull request #13546 from KorPhaeron/RADIATION_PULSE_DETECTED 
Removes rad pulse admin notice
 2015-12-11 07:14:15 -06:00
Jordie
d7e7ef9280 Update energy.dm 2015-12-11 16:25:16 +11:00
Jordie0608
7719d8cb54 Merge branch 'master' of https://github.com/tgstation/-tg-station into arguablyallgunsareenergygunsandallbeamsareprojectiles 
Conflicts:
	code/modules/projectiles/guns/energy/laser.dm
 2015-12-11 15:59:46 +11:00
Cheridan
6b1160b644 Merge pull request #13528 from AnturK/Heartbeat 
Fixes doppler arrays
 2015-12-10 16:02:46 -06:00
Cheridan
76f05602fa Merge pull request #13523 from KorPhaeron/stat_attack 
Fixes syndicate mobs not attacking unconcious people
 2015-12-10 15:42:03 -06: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
blah
844b10fa33 Whoops I left a debug 2015-12-10 14:42:43 +00:00
blah
acf95ccfd9 Fixes the pAI and removes the .gitignore issue that I caused from other stuff 2015-12-10 14:40:04 +00:00
KorPhaeron
1bcd8e57f2 Removes rad pulse admin notice 2015-12-10 04:26:56 -06:00
KorPhaeron
755455c9de New sprite 2015-12-10 01:36:27 -06:00
KorPhaeron
d4f3d47c0a Adds survival capsules to pods 2015-12-10 01:09:12 -06:00
KorPhaeron
50e4e77250 Fixes UI stuff 2015-12-09 21:37:18 -06:00
Nerd Lord
746c7738c9 Fixes revenant antag pref being impossible to toggle. 2015-12-09 22:15:45 -05:00
Cheridan
b0da7b3a64 Merge pull request #13496 from AnturK/spawnerfix 
Fixes pre-round sleeper activation
 2015-12-09 20:16:56 -06:00
Cheridan
5004bcdba2 Merge pull request #13122 from RemieRichards/Synths 
Adds a Synth Species
 2015-12-09 20:11:09 -06:00
Cheridan
e619b8fb55 Merge pull request #13512 from AnturK/mulebutts 
Bot and general pathing fixes
 2015-12-09 20:03:41 -06: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
blah
5fff63d62c Changes pAI to have hearable_message() rather than visible_message() as that doesn’t work from inside objects 2015-12-09 20:04:54 +00:00
AnturK
6d63d5e234 Fixes doppler arrays 2015-12-09 20:06:14 +01:00
Lo6a4evskiy
174dccc78f Refactors ntick proc, fixes ninja suit not draining energy 2015-12-09 20:28:43 +04:00
KorPhaeron
68b9db27fd Fixes syndicates 2015-12-09 10:25:33 -06:00
Cheridan
3c98d1f8cf Merge pull request #13505 from Incoming5643/hud_buds 
Fixes a few team hud issues
 2015-12-09 10:20:26 -06:00
Nerd Lord
41fde5757f Fixes up blob code some; 
any blob can block atmos, the core and nodes now do so
blobs use two different procs for checking health and updating icons instead of one(there's probably a use for this)
the split consciousness verb now requires a node under your selector, instead of checking a global list of nodes and picking the newest(why?)
blobs can no longer take non-brute and burn damage types(I would make toxin do bonus damage but the crew can't apply it anyway)
 2015-12-08 23:58:05 -05:00
Cheridan
f29336a4f8 Merge pull request #13470 from AnturK/academytwo 
Academy Fixes & Upgrades.
 2015-12-08 22:25:05 -06:00
Cheridan
da3eba756d Merge pull request #13463 from Incoming5643/a_placebo_effect 
Adds glowcaps
 2015-12-08 22:08:25 -06:00
duncathan salt
189f3410e4 Merge pull request #13500 from KorPhaeron/attack_coordinate 
Attack coordinates runtime fix
 2015-12-08 21:32:21 -06:00
duncathan salt
90f6e491c1 Merge pull request #13501 from Anonus/darkblob 
Makes blobs emit less light
 2015-12-08 21:27:14 -06:00
Tkdrg
90abb82ba6 Fixes human canUseTopic() misbehaving 
Now works properly when you're inside something.
Fixes #13233
 2015-12-08 22:10:24 -03:00
AnturK
bc87752245 Fixes unpowered doors being ignored by AStar 
Fixes avoid turf functionality
Makes mulebots only recalculate paths due to blockades only once per life tick.
 2015-12-08 23:56:21 +01:00
Incoming5643
40cac0aec3 Racism against division must end 2015-12-08 13:53:18 -05:00
duncathan salt
14427970cb Merge pull request #13495 from xxalpha/smoothballs 
Fixes away mission icon smoothing.
 2015-12-08 11:53:17 -06:00
duncathan salt
4d3bee9933 Merge pull request #13494 from tkdrg/Howdid-this_evenBreak 
Fixes AI camera reactivation
 2015-12-08 11:53:06 -06:00
duncathan salt
3ac8a3fc9a Merge pull request #13491 from GunHog/Gimme_ALL_The_HUDS! 
Adds Diagnostic HUD to ghosts
 2015-12-08 11:52:53 -06:00
duncathan salt
43358ba5d4 Merge pull request #13489 from ktccd/BlobwinFix 
Fixes the blob win condition
 2015-12-08 11:52:10 -06:00
duncathan salt
09cb5b732e Merge pull request #13484 from MrStonedOne/patch-82 
Makes noslip floors speed movement up.
 2015-12-08 11:51:41 -06:00
duncathan salt
160d5428b8 Merge pull request #13474 from Shadowlight213/Aghost_control 
Allows admins to interact with most machines like an AI [Review Ready]
 2015-12-08 11:51:27 -06:00
duncathan salt
9cd7bdb0a0 Merge pull request #13462 from KorPhaeron/holes 
Chasm/hole turfs
 2015-12-08 11:47:05 -06:00
duncathan salt
14a41f11f6 Merge pull request #13388 from KorPhaeron/barricade 
Buffs sec barricades
 2015-12-08 11:45:04 -06:00