cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-27 09:31:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,932 Commits 61 Branches 14 Tags
b3733df367cf0be10e77dfe86cdf0a7ecfa64a13
Commit Graph

1485 Commits

Author SHA1 Message Date
Cheridan
77d45e7017 Merge pull request #9824 from Incoming5643/all_my_old_shit_breaks_because_of_my_new_shit 
Fixes show_game_type_odds
 2015-06-09 16:07:33 -05:00
Incoming5643
a4ffa349f6 Removes a repeated line on protecting assistants from traitor roles 
look at me, I'm so confident I'm using the web interface
 2015-06-07 00:13:01 -04:00
Incoming
cbd1c9a788 Fixes show_game_type_odds 
It had been accidentally gutted way back in #4215 so I've brought it back properly and better than ever.
 2015-06-06 23:20:20 -04:00
xxalpha
9cb1061bfb Fixed hacking from inside machines and more. 2015-06-06 11:34:12 +01:00
Cheridan
ed8dffca94 Merge pull request #9721 from Jordie0608/callingspicyfoodwickeddoesntmakesensetome 
Bugfix: Witticism depleted editon
 2015-06-03 09:49:51 -05:00
Cheridan
2d998452db Merge pull request #9715 from Firecage/datumspaths 
Changes alot of datum/ to /datum/, also includes other path types such as /obj/
 2015-06-02 23:04:51 -05:00
Cheridan
905f350597 Merge branch 'unsimulatedIsKill2' of git://github.com/Aranclanos/-tg-station into Aranclanos-unsimulatedIsKill2 
Conflicts:
	code/game/smoothwall.dm
 2015-06-02 13:45:56 -05:00
Aranclanos
e7c0d7e95c Removes unsimulated turfs. 
Moves shuttle turfs to paths under /turf/simulated/floor and /turf/simulated/wall
Players can now safely build on top of shuttle turfs
Fixes #1711
Adds several but not all paths for the different types of floor turfs, most of them in plasteel_floor.dm
The turf pathings are still in need of a deeper organization, but this is at least a start
 2015-06-01 23:24:18 -03:00
Cheridan
2aa0247b00 Merge pull request #9701 from Cuboos/SoundsEp2_WizardBoogaloo 
Wizard Sounds has the update. Been a bit since i've done a commit, so…
 2015-05-31 15:51:59 -05:00
Firecage
f79e0fc1aa Updates more paths, for example obj/stuff to /obj/stuff 2015-05-31 17:48:33 +02:00
Firecage
84e8690ec6 merge conflict fix 2015-05-31 02:45:46 +02:00
Firecage
3a826fe13c Changes alot of datum/ to /datum/ 2015-05-31 02:40:54 +02:00
Jordie0608
fc5149dbc3 brainloss check for topic and autolathe hack designs fix 2015-05-30 21:24:23 +10:00
Cuboos
fcc18020a9 Wizard Sounds has the update. Been a bit since i've done a commit, so forgive me if i did this wrong. Also added the third title song, there a lot of agreement on what to do so i'll just add it as is, if a change needs to be made i'll do it later. 2015-05-29 20:29:37 -07:00
Jordie0608
6b524f09a9 eol fixes (probably) and examine fix in closets 2015-05-28 20:48:47 +10:00
Jordie0608
b310811fdd reverts removing protectstation and clearing zeroth law 2015-05-28 19:13:30 +10:00
Jordie0608
0cafaf9373 zeroth laws can be removed with core boards 2015-05-27 12:09:09 +10:00
Incoming
69f8f6575b Antagonists Will No Longer Show Up as MODE in round end reports. 
Instances where the game would give special treatment to MODE players will instead check to see if a player's assigned_role (job) matches their special_role (antag status). All antags that start off station (as well as ninjas for some weird reason) were affected.

Fixes #8743
 2015-05-25 15:58:32 -04:00
Cheridan
a7a5a9acda Merge pull request #9543 from Aranclanos/astar 
AStar fixes
 2015-05-25 06:24:36 -05:00
Cheridan
cbb91c601f Merge pull request #9616 from Jordie0608/ifhuamnityexpandstoanothersolarsystemwewillhavetorenamesunglasses 
Bugfix goes Forth+1
 2015-05-24 23:39:40 -05:00
Jordie0608
68eda1787b fixes cells corrupt()ing maxcharge, mime spells as borg and condi botles not allowing naming 2015-05-23 19:56:03 +10:00
Carl Ivanov
023bca1b57 pushing some data into locked records 
they are species type and mutamt color.
Useful in respawn character.
 2015-05-20 19:16:38 +09:00
Aranclanos
df02e068a0 Fixes diseases not infecting people behind tables or other objects with density that do not block air. 
Fixes poly from smashing herself constantly against windows trying to reach unreacheable items.
Changed the way AStar selects the adjacent turfs from each turf, taking in count the capabilities of the object or mob who will move. For example, being able to pass over tables.
The new system will use the bitflag atmos_adjacent_turfs to reach for adjacent turfs and CanPass().
Fixes #436
 2015-05-17 08:49:47 -03:00
Jordie
01ad517894 Merge pull request #9457 from Cheridan/hoes 
KEEP YOUR HOES IN LINE
 2015-05-13 19:50:18 +10:00
Jordie
c71055708a Merge pull request #9448 from Ikarrus/onebuttonfix 
Fixes Quick-Create Gangs button not working
 2015-05-13 19:45:11 +10:00
Cheridan
f3e91beba6 KEEP YOUR HOES IN LINE 2015-05-11 15:58:18 -05:00
Ikarrus
b275b73597 Fixes Quick-Create Gangs button not working 2015-05-10 17:56:42 -06:00
Thunder12345
bf29f46f57 Removes duplicate armoralt state in suit.dmi 2015-05-10 16:52:32 +01:00
phil235
1875f3a9c2 Merge pull request #9377 from Jordie0608/thebackpackistherealmagicitemhere 
Group of fixes
 2015-05-09 16:23:46 +02:00
Cheridan
d426ab0173 Merge pull request #9379 from Firecage/powermanifestation 
Increases super power manifestation chance.
 2015-05-08 15:59:13 -05:00
Cheridan
feda2e8ffc Merge pull request #9382 from Incoming5643/warpsandwarpsandwarps 
Fixes teleporting out of a jaunt
 2015-05-08 15:24:04 -05:00
Cheridan
98e63e0943 Merge pull request #9364 from Incoming5643/PleasePlaySecurity 
Players who enjoy loyalty implanted jobs now get fair antagonist rolls in all modes
 2015-05-08 12:39:14 -05:00
Cheridan
461d5bf77f Merge pull request #9262 from AnturK/zap 
Fixes #9251 - Lightning Bolt issues
 2015-05-06 22:35:48 -05:00
Incoming
ccff89cdd1 Fixes #3622 
Also fixes an annoying unreported bug where jaunt always dumped you one tile away from where you actually reappeared
 2015-05-06 16:55:00 -04:00
Firecage
b044a29412 Adjusted manifestation chance. 2015-05-06 22:28:40 +02:00
Firecage
655f8e107e Increases power manifestation chance. 2015-05-06 19:26:06 +02:00
Jordie0608
f85b3735bd group of fixes 2015-05-07 00:40:26 +10:00
Cheridan
fc93709196 Merge pull request #9322 from Incoming5643/hoo_hah 
Fixes about half a dozen runtimes related to monkey mode
 2015-05-06 08:21:00 -05:00
Incoming
23cc8c7db0 All modes now choose their antagonists before they choose jobs. A new mind attached list, restricted_roles, will keep incompatible jobs out of rotation. 
Players who would otherwise qualify to play as an implanted job will spawn as the most wanted not implanted job they qualify for if they are an onstation antagonist. If they don't qualify for any job in this way depending on preferences they will either spawn as an assistant or a random job (which also makes sure they don't end up in an incompatible job).

Note this doesn't impact late join antagonists or mulligan antagonists. Roundstart only.
 2015-05-05 23:29:03 -04:00
Cheridan
78e25c3175 Merge pull request #9220 from RemieRichards/PlasmaaaaaaaMeeeeeeen 
Ports VG's Plasmamen + Species breathing additions
 2015-05-04 00:19:18 -05:00
Incoming
66c4b59099 Fixes about half a dozen runtimes related to monkey mode: 
Fixes monkeys not getting a special role when made with jungle fever because of a runtime

Fixes check_monkey_victory runtiming and always defaulting to "the monkeys won!"

Adds a check for monkey modes that end on station because all the monkeys died and continuous is off (it is by default off)

Fixes a runtime relating to trying to change a monkey's mutantrace (don't do this)

Adds a check to not end the round if all the monkeys died but there are still people waiting to become monkeys because they got bit.

Maybe some other tiny monkey fixes I'm not even sure at this point I wasted a sunday night fixing monkey mode problems
 2015-05-03 23:58:16 -04:00
Jordie
6008404738 Merge pull request #9185 from AnturK/aliens_stole_my_branch_name 
Abduction Update 2.5
 2015-05-02 23:59:48 +10:00
Jordie
562766bdb0 Merge pull request #9129 from Incoming5643/begone_ye_jellies 
Some Mutantrace Housekeeping
 2015-05-02 23:59:15 +10:00
AnturK
34437dffb6 - Makes additional batons cost 2 experiment points. 
- Fixes typo in floors.dmi
- Traitor panel buttons now grant objectives as well
 2015-05-02 12:57:49 +02:00
AnturK
0115296a86 Fixes alien table icon 2015-05-02 12:54:53 +02:00
AnturK
a92b3b24e4 - Adds make abductor buttons on traitor panel 
- Fixes clotheless surgery
 2015-05-02 12:54:52 +02:00
MrStonedOne
eb7d5fefa5 Merge remote-tracking branch 'upstream/master' into step-aside-aran-im-here-to-touch-your-precious 
Conflicts:
	code/controllers/subsystem/ticker.dm
 2015-05-02 03:03:29 -07:00
AnturK
5f4fbe0379 Fixes #9251 - Lightning Bolt issues 2015-05-01 19:22:57 +02:00
Incoming
88260a638a Adds enforce continuous rounds and allow midround antagonist reporting to get revision. It won't tell you which modes have them on from there (because it's player accessible) but will show how many roundtypes are currently set to use the features. 
Standard config options would currnetly read:
Enforce Continuous Rounds: 10 of 18 roundtypes
Allow Midround Antagonists: 8 of 18 roundtypes
 2015-04-30 12:14:41 -04:00
Incoming
7459238065 Merge branch 'master' of https://github.com/tgstation/-tg-station into begone_ye_jellies 
Conflicts:
	code/game/machinery/teleporter.dm
 2015-04-29 13:37:01 -04:00