cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-16 03:56:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,312 Commits 61 Branches 14 Tags
8286e70c20024d92d97c51bc34eef8b95d427310
Commit Graph

880 Commits

Author SHA1 Message Date
Cheridan
e25affe12e Merge pull request #4337 from Miauw62/say() 
[READY] Saycode rewrite
 2014-08-31 10:59:04 -05:00
Miauw
78a9b0be69 Merge branch 'master' of https://github.com/tgstation/-tg-station into say() 
Conflicts:
	code/__HELPERS/game.dm
	code/game/gamemodes/cult/runes.dm
	code/game/machinery/requests_console.dm
	code/game/machinery/telecomms/logbrowser.dm
	code/game/objects/items/devices/PDA/radio.dm
	code/game/objects/items/devices/aicard.dm
	code/modules/admin/admin_verbs.dm
	code/modules/assembly/holder.dm
	code/modules/assembly/voice.dm
	code/modules/mob/living/carbon/brain/brain.dm
	code/modules/mob/living/carbon/human/whisper.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/say.dm
 2014-08-31 13:40:16 +02:00
Alex
660a76e2a8 Merge pull request #4611 from Ikarrus/reportgrammar 
Minor grammar correction for Centcom report names
 2014-08-31 12:36:58 +01:00
Alex
a931f00608 Merge pull request #4563 from Ikarrus/allspecies 
Secret Button to set everyone's mutant race
 2014-08-31 12:32:02 +01:00
Alex
679e0bda52 Merge pull request #4524 from Ikarrus/eventsprompter 
Trigger Events verb will now ask if the admin wants to announce to the crew
 2014-08-30 20:12:46 +01:00
ikarrus
2f65498aa7 Minor grammar correction for Centcom report names 2014-08-30 11:18:19 -06:00
Miauw
98d567dde7 more say bugfixes 2014-08-29 14:40:51 +02:00
ikarrus
1cfdde31f3 -Trigger Event is now its own panel 
-The prompt to alert the crew now includes a cancel button
-Holiday Events are now marked more clearly in the menu
 2014-08-28 22:08:14 -06:00
Miauw
bc2b8d0d5d DONE DONE DONE DONE DONE DONE 2014-08-27 17:40:26 +02:00
ikarrus
828d1627a3 code optimization 2014-08-26 10:51:20 -06:00
Firecage
6c7af5eb32 SPANCLASSES!!!!! 2014-08-26 09:52:13 +02:00
ikarrus
eac854ec97 Secret Button to set everyone's mutant race 
Mostly as a way to reverse the consequence of an badmin's lapse of good judgement (There's no easy way to reverse the Halloween event button.). This can also be used for an assortment of badminning.
 2014-08-24 15:52:53 -06:00
Alex
6e35d0cd7f Merge pull request #4554 from Ikarrus/deathsquadnames 
Deathsquad names will pull from the deathsquad name list
 2014-08-24 13:08:45 +01:00
Alex
f061c0d9d3 Merge pull request #4418 from Ikarrus/minorannouncements 
Minor Announcements
 2014-08-24 13:06:31 +01:00
ikarrus
cba3fa364f Reducing dup code 2014-08-23 21:43:48 -06:00
ikarrus
5413812958 Deathsquad names will pull from the deathsquad name list 
I didn't know they were a thing. But now they are, once again!
 2014-08-23 21:41:49 -06:00
ikarrus
ba45abdf25 Admins changing shuttle time will use minor_announce instead of priority_announce 2014-08-23 20:22:47 -06:00
ikarrus
951c8bddef Resolve Conflicts: 
code/modules/admin/topic.dm
 2014-08-22 12:58:59 -06:00
ikarrus
9843dbc37d Trigger Events verb will now ask if the admin wants to announce to the crew 
Additionally,
-Create virus re-added to secrets menu, as it had options to specify a specific virus to create
-Blob added to One-Click-Antag with the option to set the strength of the blob (1=Weak, 2= Strong, 3=Full)
 2014-08-21 21:33:53 -06:00
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