cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-24 08:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,100 Commits 61 Branches 14 Tags
0891744c8eb28e3eeb85b3b2cb28aef906f0e026
Commit Graph

861 Commits

Author SHA1 Message Date
ikarrus
0891744c8e Resolved Conflicts: 
_maps/map_files/tgstation.2.1.3.dmm
 2014-08-21 19:47:30 -06:00
Alex
01354b70f3 Merge pull request #4458 from Ikarrus/trigger_event 
Removed Events from Admin Secrets menu. Trigger Event verb moved to Fun tab
 2014-08-21 13:28:16 +01:00
ikarrus
4271b6a859 Removing duplicate href code 2014-08-18 22:29:32 -06:00
Alex
7e25fe77e8 Merge pull request #4461 from Jordie0608/tbhtheentirefeatureiskindasilly 
Updates admin nicknames, moves list to txt file
 2014-08-18 08:25:05 +01:00
ikarrus
0de9402a18 Made receiving and printing centcom reports a proc 
Also changed a few "Cent. Com." strings to "Centcom"
 2014-08-17 13:03:11 -06:00
ikarrus
9d4d755174 Made deathsquads traitors to aid in tracking, admin tools, and end-round reporting 2014-08-16 10:50:52 -06:00
Jordie0608
ac1a479da8 Updates admin nicknames, moves list to txt file 2014-08-16 19:14:17 +10:00
Ikarrus
67a18271f2 Update one_click_antag.dm 2014-08-16 00:46:24 -06:00
ikarrus
d56274a4ab Adds Deathsquad to Quick-Create Antagonist Menu 
-Pressing this button will spawn up to 5 death commandos on centcom with a customizable objective
-Added a shuttle console to the ferry that, rather than moving the shuttle, will send a request to admins instead
-Deathsquaddies get an energy shield
-Deathsquad beret will no longer hide head, face, and hair
 2014-08-16 00:40:37 -06:00
ikarrus
170c0e1b6b Removed Events from Admin Secrets menu. Trigger Event verb moved to Fun tab. 
-No more need to maintain a list of events to trigger
-No more needing to use debug-verbs to trigger all events
 2014-08-15 20:24:49 -06:00
ikarrus
51251a2449 Fixes #4220 (Select-Equipment > As Job... doesn't assign jobs to their ID and PDA) 
Fixes #4220
 2014-08-14 22:43:58 -06:00
Alex
b05b214d79 Merge pull request #4344 from Aranclanos/removewarn 
Removes warn button on the player panel.
 2014-08-12 08:08:21 +01:00
Aranclanos
837428babd Merge pull request #4370 from hornygranny/badmins 
admins can't edit their rank's powers
 2014-08-09 17:02:28 -03:00
Hornygranny
c538030790 admins can't edit their rank's powers 2014-08-07 12:00:48 -07:00
paprka
d41a469ff4 Merge branch 'master' of https://github.com/tgstation/-tg-station into goodbyedeadspace 
Conflicts:
	code/game/mecha/mecha.dm
 2014-08-06 15:22:56 -07:00
Aranclanos
12242cad7d Removes the unused and useless warn button on the player panel. 2014-08-06 03:43:28 -03:00
paprka
265b4db7d4 one more pass 2014-07-29 16:59:20 -07:00
paprka
eea9ae50ad merging 2014-07-29 16:50:21 -07:00
paprka
d992c907c6 goodbye rigsuits my old friends 2014-07-29 11:43:34 -07:00
KyrahAbattoir
fcb2fb9de3 Another lowercasing pass on a bunch of items and furnitures. 
Synthflesh should be a plural.
Leg cuffs is better than legcuffs.
LaserTag -> laser tag is not a brand name.
centcom -> Centcom is always capitalised.
 2014-07-27 19:14:40 +02:00
Alex
90c97375e3 Merge pull request #4193 from A-t48/PrisonButton 
Fix #4164: Non-functional admin prison button
 2014-07-25 09:25:05 +01:00
Alex
6da164fa57 Merge pull request #4194 from A-t48/AdminMeteorConfirm 
Fix #3738 Admin spawned meteors has no announcement confirmation
 2014-07-25 09:24:46 +01:00
Kyle Franz
93a76deb27 Clean up prison button code a bit 
Add nicer confirmation message
Change access restriction from FUN to admins
Remove paralyzation\sleep
 2014-07-22 12:43:32 -07:00
Cheridan
f6b9fef747 Merge pull request #4184 from paprka/xtraperiods 
Removes extra periods from (ban) [reason]
 2014-07-21 08:34:50 -05:00
Kyle Franz
fc5a6f9915 Fix #3738 Admin spawned meteors has no announcement confirmation 2014-07-19 00:20:19 -07:00
Kyle Franz
92ef19b8b9 Don't make imprisoned players lose all thier stuff 2014-07-18 23:05:14 -07:00
Kyle Franz
3f12c04b27 Fix nonfunctional Prison button on Player Panel 2014-07-18 23:03:57 -07:00
paprka
b35cee5334 Removes extra periods from ban reasons 2014-07-17 17:51:20 -07:00
Cheridan
8fdd519401 Merge branch 'master' of https://github.com/tgstation/-tg-station into go_ape 2014-07-15 14:31:45 -05:00
Alex
46c3a61fca Merge pull request #4071 from CollenN/panelfix 
Spawned humans have DNA, strip panel is better
 2014-07-11 19:02:50 +01:00
Cheridan
3612a9a8a0 MONKEY MODE: "IT ACTUALLY WORKS" EDITION 
Probability support for monkey mode.
Player config support for monkey mode.
Check Antags support for monkey mode.
 2014-07-08 22:55:47 -05:00
CollenN
ccaef08fdc Moves stuff to New() 
Alright, I tested it, and this worked, so...
 2014-07-07 14:02:58 -04:00
CollenN
6b4cf7783b Spawned humans have DNA, strip panel is better 
Fixes #4044
Fixes #4064

Spawned humans now have DNA, along with a randomized appearance and
name, making them similar to monkeys turned into humans.

Strip panel is now more organized and doesn't have any duplicated lines.
 2014-07-05 22:47:50 -04:00
Cheridan
7e724a9f65 Merge pull request #3851 from Ikarrus/splat 
Shuttles docking on you will really hurt
 2014-07-01 23:29:05 -05:00
ikarrus
d3ec4dbf72 Resolving Conflicts: 
_maps/map_files/tgstation.2.1.3.dmm
	code/game/machinery/bots/ed209bot.dm
	code/game/machinery/bots/secbot.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/monkey/monkey.dm
 2014-06-27 09:30:43 -06:00
Cheridan
02603f89e4 Merge pull request #3934 from Ikarrus/jobequip 
The Select-Equipment admin verb now includes all jobs
 2014-06-21 00:47:30 -05:00
Cheridan
375997f245 Merge pull request #3919 from MrPerson/qdel_logging_verb 
Add logging to failed GC's that result in a del() call
 2014-06-20 10:33:22 -05:00
Alex
7b7f8bf583 Merge pull request #3916 from hornygranny/rip_wip 
removes gravity failure event placeholder
 2014-06-16 10:40:40 +01:00
ikarrus
7f1bea18e5 Securitron Update 
-Added a new access type that will act as a weapon permit that the HoS/HoP can manage. Centcom, Security, Captain, HoP, and the Barman start with it.
-Securitrons will now have the option to declare arrests they make to anyone who is wearing a security HUD. This can be turned off per-securitron
-Securitrons now have the option to arrest humans without any IDs. Defaults to off.
-Changed how securitron threat assessment is calculated
-Removed detective access from securitrons
-Stunning and cuffing now properly bolds their text for the perp
-Pingsky has its own type now

I realise there is a lot of existing duplicate code between the EDs and the securitrons, but I don't think I'd have the capability to tackle that any time soon.
 2014-06-15 16:19:32 -06:00
ikarrus
726b1dc28f The Select-Equipment admin verb now includes all jobs 
Useful for admins and coders alike.
 2014-06-14 22:05:15 -06:00
MrPerson
44638fd05c Add logging to failed GC's that result in a del() call 
You can view these logs in-game using a debug verb. You have to use the debug-verbs command to see it.

Removed the dellogging compile option. If this is a problem, speak up, but for most users, this new functionality is more useful.
 2014-06-13 11:46:17 -07:00
Hornygranny
0b4387f031 removes gravity failure event placeholder 2014-06-12 14:52:53 -07:00
ikarrus
a7f696e6e1 Shuttles will always destroy things in their way 
Fixes #1992

Also:
-Adds labour shuttle to admin secrets
-Removes delay when admins move shuttles
 2014-06-05 22:19:38 -06:00
phil235
23746fc228 under/det into under/rank/det 2014-05-31 00:36:26 +02:00
Alex
9066cccf9c Merge pull request #3645 from Ikarrus/announcements 
Priority Announcement Changes
 2014-05-18 02:07:55 +01:00
Alex
e87d84fbe4 Merge pull request #3694 from Rolan7/Issue2883-medal 
Medal of Captaincy is no longer twice as large.
 2014-05-15 11:55:57 +01:00
ikarrus
56d5412e50 Merge branch 'master' of https://github.com/tgstation/-tg-station into announcements 2014-05-14 08:34:49 -06:00
Alex
3468c832a1 Merge pull request #3667 from MrStonedOne/adminpermfix 
Minor fixes to admin permissions
 2014-05-14 09:57:00 +01:00
Rolan7
ab1dd6fc0d Medal of Captaincy is no longer twice as large. 
Fixes issue #2883 and a minor bug where set-equipment wasn't properly equipping "assassins" with waistcoats.  Both cases now use the existing attachTie method, which exists for this reason.
 2014-05-14 02:14:28 -04:00
MrStonedOne
a4e4e2bcce Admins without +admin can use jmp herfs while ghosted 
They already have access to jump to mob and follow, so no reason to deny them this.

Only allows access to jmp herfs while ghosted.
 2014-05-08 13:19:26 -07:00