cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-16 12:07:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,843 Commits 61 Branches 14 Tags
87edea4eab075e482284435a69f7a6746bb86c62
Commit Graph

1200 Commits

Author SHA1 Message Date
Swag McYolosteinen
baf3c06171 Merge pull request #8957 from MrStonedOne/I-spent-five-minutes-trying-to-think-up-a-branch-name-and-all-I-got-was-this-lousy-excuse-of-one 
Admins can now drag ghosts to mobs to put that ghost in control of that mob
 2015-04-15 12:24:13 +02:00
MrStonedOne
2227b7adb3 Adds some sanity checks to admin ghost drag. 2015-04-15 02:58:54 -07:00
MrStonedOne
e1338fed2b fixes a minor mishap with ghostize in admin ghost drops 2015-04-14 07:21:23 -07:00
MrStonedOne
f2e2940255 Makes admin ghost drag use ghostize 2015-04-14 06:01:42 -07:00
MrStonedOne
39decb8bf6 Admins can now drag ghosts to mobs to put that ghost in control of that mob. 
This functions the same way as editing the ckey in vv, and has the same permission checks
It requires the admin also be a ghost to avoid conflicts with other drag drop code.
 2015-04-13 17:33:04 -07:00
Cheridan
8402c714be Merge pull request #8921 from xxalpha/lovely_vibes 
Added /obj/item/stack path to Game Panel.
 2015-04-13 16:33:19 -05:00
AnturK
6fa8e5f02d Adds Abduction Mode 2015-04-13 18:40:15 +02:00
Jordie
ae120db87c Merge pull request #8728 from AnturK/action_button 
Generic Action\Action Button System
 2015-04-13 18:22:08 +10:00
xxalpha
ca8870ad96 Added /obj/effect and /obj/item/weapon/gun path to Quick Create Object. 2015-04-12 18:26:24 +01:00
xxalpha
cb800d3070 Added /obj/item/stack path to Quick Create Object of Game Panel. 2015-04-12 17:38:01 +01:00
Swag McYolosteinen
853009f7e0 Merge pull request #8157 from Xhuis/shadowling_gamemode 
Shadowling (MERGE-READY!!)
 2015-04-11 17:51:23 +02:00
Xhuis
c9338f7212 Shadowling: RELEASE EDITION 2015-04-11 11:42:02 -04:00
AnturK
e2c869bc77 - Adds generic action and action buttons system 2015-04-11 17:06:43 +02:00
Cheridan
076fc321f0 Merge pull request #8859 from Incoming5643/gutcheck_time 
Better admin/config control of mulligans + tweaks
 2015-04-10 15:19:42 -05:00
Cheridan
72eacad839 Merge pull request #8854 from MrStonedOne/thisshouldmakethingseasier 
Minor permission panel fixes
 2015-04-10 12:40:55 -05:00
Incoming
d1892cffbe Organizes the various continuous_round_x config options into one set of config options continuous. Functionality is only there for the same mode that already had that functionality, everything else is continuous always 
Makes another set of config options for which rounds types, if any, use the midround antagonist (mulligan) system. Keep in mind this is by definition a subset of round with continuous set. Again this feature is only present for the roundtypes where I KNOW it works properly, other modes can't use midround antags.

The check antagonist screen will show how the game will behave when all the antagonists die, and it can be changed on the fly by admins, the four possible states are:

End on antagonist death (noncontinuous rounds)
Continue if antagonists die (unsupported continuous by default round)
Continue if antagonists die, creating replacement antagonists (continuous, using midround antags)
Continue if antagonists die, not creating new antagonists (continuous, not using midround antags)

When rounds prepare to mulligan admins will additionally get the option to just keep the round going without any automatically created antags in case they want to run their own shinanagans instead. They can also as before choose to end the round.
 2015-04-09 16:03:11 -04:00
MrStonedOne
5b2221cd4f Changing/adding an admins rank now updates the player's table 2015-04-09 03:19:55 -07:00
MrStonedOne
af35d31bd9 Fixes the rank button on player panel 2015-04-09 03:19:20 -07:00
Fayrik
98b5f41770 As you can see, I'm an idiot that codes potential infinite loops. (But I also fix it too.) 2015-04-07 21:48:00 +01:00
Jordie
57e1274353 Merge pull request #8624 from Cheridan/day42_betsoff 
Day Who-Knows: Bar Gambling Expansion!
 2015-04-02 20:15:18 +11:00
Cheridan
9606763e5f Merge pull request #8583 from Fayrik/CentcomExpansion 
Centcom Two: It's better now, I swear.
 2015-03-30 21:35:19 -05:00
Cheridan
caecd36d7c Merge pull request #8552 from Jordie0608/togetwiththetimesyouwillfirsthaveotfindthem 
Removes old player panel
 2015-03-30 09:57:39 -05:00
Cheridan
884e9e3774 Day Who-Knows: Bar Gambling Expansion! 
Space cash is stacks
Adds dealer table to map
 2015-03-29 18:09:54 -05:00
Jordie
98873da060 Merge pull request #8549 from tedward1337/Ohgodthisishard 
Adds Bluespace artillery button.
 2015-03-30 01:20:45 +11:00
Fayrik
7336e6ecb8 Call Centcom! ERTs got fixed! 2015-03-29 03:54:54 +01:00
Fayrik
4f43fff199 Issue fixes! All that, and more! 2015-03-29 03:54:41 +01:00
Cheridan
17067d9021 Merge pull request #8508 from phil235/SlimeAnimal 
Life refactor and slime as animal
 2015-03-27 13:38:16 -05:00
Jordie0608
4beac828e2 removes old player panel 2015-03-26 17:30:16 +11:00
tedward1337
83961b85c9 Adds a new button for admins with +fun to push. Sends bluespace artillery to the station at the whim of God. 2015-03-25 22:03:45 -04:00
MrPerson
ce13faed09 Change select holiday names to #defines 2015-03-25 15:01:06 -07:00
MrPerson
9910cf3fe3 Change holidays into datums 
Holidays are now actual datums with procs and vars and everything.
Holidays run a proc called celebrate() when it's time to celebrate them. Currently none of them do anything but that should change, wink wink.
Holidays can now run for more than a day. The important ones, april fools, christmas, halloween, new years, and easter, all last at least a week. The idea is so people can celebrate christmas in game without having to, you know, actually play on fucking christmas. And also to put a time limit on how long stuff like the annoying spookoween closet skeletons will stick around so it doesn't overstay its welcome and become annoying as shit like last year.
The event SS now allows more than 1 holiday to run at a time. This matters for new years + christmas, easter + april fools, easter + 4/20, and any holiday that can happen on friday the 13th. The events get stored in a list that's only initialized if there's an active holiday so testing for potential holidays is still pretty easy.
Added more easter dates so we won't have to add more until 2040. The current batch run out in 2017.
 2015-03-25 01:46:29 -07:00
phil235
ffd711c26f Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal 
Conflicts:
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/simple_animal/friendly/corgi.dm
	code/modules/mob/living/simple_animal/slime/say.dm
	code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
 2015-03-23 16:51:03 +01:00
Swag McYolosteinen
53e40ec315 Merge pull request #8427 from Cheridan/day3_collars 
Event Day 3 - Pet Collars!
 2015-03-22 19:37:12 +01:00
phil235
daa1bdf856 More work on slime procs. 2015-03-21 16:37:37 +01:00
phil235
aecb365f84 Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal 
Conflicts:
	code/modules/mob/living/carbon/alien/life.dm
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/living/simple_animal/slime/life.dm
 2015-03-20 19:32:16 +01:00
Remie Richards
5b18ed7c2e Merge pull request #8403 from MrPerson/no_bug_here 
Fixes character appearances - no more bald albinos
 2015-03-20 04:36:32 +00:00
MrPerson
721b81373a Removed commented out regenerate_icons() 2015-03-19 21:35:24 -07:00
Jordie
0cdd34ee05 Merge pull request #8354 from MMMiracles/hardsuit_upgrade 
Revamps ERT suits to use helmet toggle
 2015-03-19 16:45:05 +11:00
Cheridan
7149f0382d Adds Pet Collars! 
Map needs update now
 2015-03-18 21:27:21 -05:00
MrPerson
e9a36f4d53 Fixes character appearances - no more bald albinos 
Fixes #8383

Also removed two defunct comments.
 2015-03-18 02:21:56 -07:00
phil235
78d28a6d64 Merge branch 'master' of https://github.com/tgstation/-tg-station into BigUserdanger 
Conflicts:
	code/modules/events/ninja.dm
 2015-03-15 12:30:27 +01:00
MMMiracles
abb835b487 revamps ERT hardsuits to use the helmet toggle, organizes the listing to be slightly better looking. 2015-03-15 02:03:18 -04:00
phil235
456a64f8fd slime from carbon to simple animal 2015-03-14 23:40:57 +01:00
Cheridan
28f6aae00c Merge branch 'NinjaCleanup' of git://github.com/RemieRichards/-tg-station into RemieRichards-NinjaCleanup 
Conflicts:
	icons/mob/back.dmi

remie is a nerd btw
 2015-03-12 20:47:11 -05:00
phil235
29609457f5 Makes the message when you're attacked slightly bigger for better visibility." 
Changes two "for... show_message()" into "visible_message()".
 2015-03-12 23:15:54 +01:00
phil235
1eba7b694b Merge pull request #8134 from Miauw62/ghostradios 
Adds a toggle so ghosts can hear radio chatter more easily.
 2015-03-10 23:56:28 +01:00
Remie Richards
f6e4c1518d A restructure/removal/cleanup of Ninja Code 2015-03-09 20:43:56 +00:00
Cheridan
237f5c366a Merge pull request #8177 from MrStonedOne/patch-2 
IsBanned() now rejects blank ckeys/ips/cids
 2015-03-09 00:31:26 -05:00
Cheridan
0015d4c120 Merge pull request #8141 from Incoming5643/Subjectivity_is_a_bitch 
Skipping mulligan antag based on Time/Subjectivity from admins + tweaks
 2015-03-09 00:14:28 -05:00
Remie Richards
04dcfaddcf Merge pull request #8135 from Miauw62/adminjumpfixes 
Fixes adminjump being dumb.
 2015-03-07 18:17:41 +00:00