cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-17 04:27:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,930 Commits 61 Branches 14 Tags
f992eb1af03df7e983bd7dfae125be88f2d77792
Commit Graph

1297 Commits

Author SHA1 Message Date
Iamgoofball
a9c25caef3 forgot the new admin debug verb 2015-06-06 18:50:14 -07:00
Iamgoofball
8aa79e1f1c fixes and changes 2015-06-06 18:40:38 -07:00
Cheridan
6ca4cb1e64 Merge pull request #9735 from Jordie0608/whyevenhavetwoverbs 
World.Reboot() Improvement
 2015-06-05 16:43:13 -05:00
Jordie0608
bd7019e033 standardizes Reboot(), allows round to be delayed after it finishes and removes immediate reboot verb 2015-06-01 22:07:22 +10: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
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
Remie Richards
c5a2c5d396 Merge pull request #9572 from Aranclanos/stealthAdminPM 
Fixes admin-PM on stealth
 2015-05-25 18:28:32 +01:00
Remie Richards
61c0ddebbb Merge pull request #9553 from AnturK/probing_fan_club 
Adds abductees to check antags panel
 2015-05-25 18:14:10 +01:00
Cheridan
f12f12ed60 Merge pull request #9562 from Aranclanos/newscaster 
Newscaster code big cleanup.
 2015-05-24 19:47:05 -05:00
Cheridan
8cc916c52b Merge pull request #9618 from phil235/RuntimesMustDie 
More runtimes fixed
 2015-05-24 18:11:13 -05:00
phil235
f643769ef4 Fixes some runtimes with bluespace artillery, handcuffs on simple animals, lobby music start, stunbaton attack, kitchen bowl update_icon, particle accelerator admin log message, and plasmaman spec_life(). 2015-05-23 22:34:04 +02:00
Razharas
1f0cbbf82b Merge pull request #9571 from bear1ake/respawn-char-fix 
Fix #4332. Also fixes mutant race respawn-char.
 2015-05-23 13:43:49 +03:00
Aranclanos
212e0c9c48 Fixes admin stealth failing to be actual stealth due to href reading or and the pop-out window. 
Fixes #1121
Adds a new associative list, stealthminID, they will be associated with raw ckey text and their contents will be a random ID. The random ID is generated when an admin goes to stealth, without repeating itself.
New client procs that will handle the list, findStealthKey() and createStealthKey()
Admin-pms will use this special ID for admins who are stealthing, hiding their real ckey.
 2015-05-20 09:26:26 -03:00
Carl Ivanov
2dc049b026 make hardset_dna to set blood type correctly 
also hardset_dna sets species and mutant race color.
 2015-05-20 19:15:08 +09:00
Aranclanos
fe4d28a376 Newscaster code big cleanup. 
Removes lots of copypaste.
Admin newscaster barely modified, they still are a gigantic copypaste from the topic.dm() of the newscaster object.
Printed diaries will now only report the information available when they were printed, including wanted status and the different types of censorship.
All datums are now under /datum/newscaster
Wanted is now a different type of datum, /datum/newscaster/wanted_message
Fixed a bug where you couldn't censor normal submissions, made by crewmembers.
Fixes #944
 2015-05-19 09:32:46 -03:00
AnturK
9064d2089e Adds abductees to Check antags panel. 2015-05-18 10:35:27 +02:00
Jordie0608
84eaa17ec9 reset ooc color buttons, changes how default color for admins is handled 2015-05-17 22:10:46 +10:00
Jordie
df2433a43f Merge pull request #9451 from Xhuis/whyAreThereFortyShadowlings 
Adds a Create Shadowling button
 2015-05-13 19:46:12 +10:00
Jordie
c769a45b3c Merge pull request #9449 from Incoming5643/con_troll 
Minor Check Antagonist Panel Beautification
 2015-05-13 19:45:22 +10:00
Jordie
e1f5ed793d Merge pull request #9356 from Firecage/Kudzulogs 
Adds logs for admins to kudzu.
 2015-05-11 23:58:38 +10:00
Firecage
c6b0c8b390 Investigate logs for kudzu planting 2015-05-11 15:18:01 +02:00
Xhuis
aa52d59b18 Adds a Create Shadowling button 2015-05-10 22:07:19 -04:00
Incoming
562bff95b4 Slightly widens the check antagonist panel 
Makes the "(logged out)" flag on antagonists read "(ghost)" because that's what it's actually tracking

Together these fix #9268

Also sneaks a bit of mulligan functionality in so admins can see what the time and life checks for the mulligan system are, and modify them midround if desired.

Also shows and allows editing of the "on failure" behavior of mulligans, specifically if they default to instant round ending if the mulligan fails or if it just doesn't create antags.
 2015-05-10 20:06:00 -04:00
Remie Richards
7e0e50302a Merge pull request #9436 from MrStonedOne/powerfixes 
Merges power subsystem into machine subsystem.
 2015-05-10 08:23:20 +01:00
MrStonedOne
c6c7237265 Merges power subsystem into machine subsystem. 
This is to avoid issues from when they fire out of sync, since powernets assume machine's subsystem will fire directly after power's does.
 2015-05-09 23:48:18 -07:00
phil235
1875f3a9c2 Merge pull request #9377 from Jordie0608/thebackpackistherealmagicitemhere 
Group of fixes
 2015-05-09 16:23:46 +02:00
Jordie
a73ef787a2 Merge pull request #9380 from SconesC/spooky-faces 
Replaces Plasmaman Gas Mask w/ Breath Mask
 2015-05-09 22:03:34 +10:00
Remie Richards
c77fefc937 Merge pull request #9374 from AnturK/abduction_third 
Abduction fixes
 2015-05-09 06:25:23 +01:00
phil235
489d076de5 Merge pull request #9126 from Jordie0608/doesrussellsteapotapplytorussellsteapot 
Fixes #9035, atmos locker sprite and misc logging bug
 2015-05-08 16:24:21 +02:00
Jordie0608
e72a4fb580 Drop-Everything deletes NODROP items 2015-05-08 18:40:23 +10:00
Cheridan
95d7af4e48 Merge pull request #9277 from Ikarrus/ertbaton 
Batons for Light ERP
 2015-05-06 09:03:55 -05:00
SconesC
20181c37b8 Replaces Plasmaman Gas Mask w/ Breath Mask 2015-05-05 17:55:32 -07: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
Ikarrus
040ffc9ace Grammar for special_role 2015-05-03 15:19:43 -06:00
Ikarrus
832e19a061 Fixed a bug with admins being told it failed to create a response team if they spawned a centcom official or deathsquad 2015-05-03 14:06:16 -06:00
AnturK
63b33f40cf Fixes button created teams not adding to gamemode 2015-05-03 15:15:09 +02:00
Remie Richards
e5f034fc0d Merge pull request #9147 from GunHog/Rise_Of_The_RR_Androids 
[Review Ready] Positronic Brains!
 2015-05-03 06:34:02 +01:00
Cheridan
bbb1df2654 Merge pull request #9263 from Incoming5643/fightvale_pride 
Fixes another instance of FIGHTVALE
 2015-05-02 17:46:24 -05:00
Jordie
d5c7ead540 Merge pull request #9165 from Xhuis/REMOVE_REVENANT_remove_revenant 
Temporarily disables revenants
 2015-05-02 23:59:36 +10:00
Jordie
562766bdb0 Merge pull request #9129 from Incoming5643/begone_ye_jellies 
Some Mutantrace Housekeeping
 2015-05-02 23:59:15 +10: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
Ikarrus
b331391aa5 Batons for Light ERT 
Moved the batons from the lockers to their backpacks so light ERTs can use them
 2015-05-01 21:30:34 -06:00
Cheridan
84d2a5a006 Merge pull request #9228 from Ikarrus/pregamedelay 
Admins can now adjust pre-game delay time
 2015-05-01 15:03:26 -05:00
Cheridan
0d1cfba3b7 Merge pull request #9200 from Ikarrus/ERTcodes 
[Z2 MAP] Centcom Response Team Variations
 2015-05-01 14:31:22 -05:00
Cheridan
509d940746 Merge pull request #9225 from Incoming5643/Unless_its_wizbiz_bugs_will_usually_follow 
Fixes Round End Sound
 2015-05-01 14:13:07 -05:00
Incoming
b19a66ba51 Fixes another instance of FIGHTVALE because the replacementmode didn't realize that the lists of antags are kept in the ticker.mode gamemode and not itself. 
Clears up some language issues that was making the check antag panel a little harder to read than it needed to be.
 2015-05-01 13:34:34 -04:00
MrStonedOne
fe1d3c22d5 Minor rework of lobby admin verbs 
Both me and #9228 fixed the same bug, so I reverted mine

Starting the round with the start now verb will now show a tip of the round.
 2015-04-30 18:27:58 -07:00
Ikarrus
0615b4e09a Merge branch 'master' of https://github.com/tgstation/-tg-station into ERTcodes 2015-04-30 08:56:46 -06:00