cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-09 00:13:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,995 Commits 60 Branches 14 Tags
577488e0d8fdbd495dc0dd34d3fdbadafec66ccb
Commit Graph

1661 Commits

Author SHA1 Message Date
xxalpha
577488e0d8 safepick 
more safepick
 2016-01-18 05:46:44 +00:00
duncathan
9066bc7c4f Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos 
Conflicts:
	code/controllers/subsystem/air.dm
	code/datums/gas_mixture.dm
	code/game/objects/items/devices/scanners.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/life.dm
	tgui/assets/tgui.css
	tgui/assets/tgui.js
	tgui/scripts/interfaces/atmos_filter.ract
 2016-01-13 20:07:21 -06:00
tkdrg
c3f95333f0 Merge pull request #14541 from lzimann/aghostfix 
Fix re-enter corpse message in adminghost
 2016-01-12 16:06:07 -03:00
Leo
92584201f4 Fix indentation 
Because I am stupid.
 2016-01-12 03:21:18 -02:00
Leo
ea69ea0fef Change so it works as intended 
But at least stops triggering the message when you don't have a body
 2016-01-12 03:12:42 -02:00
Leo
cb8080dd60 Changed so you can re-enter corpse with normal ghost verb 2016-01-12 02:43:25 -02:00
Razharas
8dc7f8947c Merge pull request #14553 from lzimann/checkantagfix 
Fix Check Antagonist button not logging when accessed by player panel
 2016-01-11 09:00:03 +03:00
Lzimann
4ab36b7c29 Fix Check Antagonist button not logging when accessed by player panel 2016-01-10 04:05:24 -02:00
Cheridan
6c9fa9eb72 Merge pull request #14389 from phil235/VisibleMessageRefactor 
Refactor the visible_message() proc to be faster in some cases.
 2016-01-09 22:16:57 -06:00
Lzimann
cb1b91bc9f Fix re-enter corpse message 2016-01-09 19:27:27 -02:00
Tkdrg
5589ac7559 Revert "Merge pull request #12935 from AndrewJacksonThe2nd/objectives_rework" 
This reverts commit 52a45b6292, reversing
changes made to 19b43ba668.

Conflicts:
	code/datums/mind.dm
 2016-01-07 23:15:35 -03:00
MrStonedOne
fd80575f38 Removes a bunch of sleep(-1) and spawn(-1) from the code 
This seems to be causing issues where if the queue was too long, byond would attempt to process through all of it while hanging everything else.
 2016-01-04 15:17:12 -08:00
phil235
e225fbc850 - Refactor the visible_message() proc to be much faster. 
- Replacing some "for(var/mob/o in viewers()) show_message()" by "visible_message()".
- Replacing some "show_message()" by " << "..." " instead.
- Fixes being able to see the results of the health and slime analyzers while blind.
-
 2016-01-04 22:49:27 +01:00
duncathan salt
421ecbeb9f Merge pull request #14323 from Shadowlight213/Mindattacklog 
Fixes VV attack logs being lost on cloning and body destruction and made gibbed antags show in check antags.
 2016-01-04 20:31:37 +01:00
MrStonedOne
5d86ed49f6 Merge conflic fix 2016-01-03 14:51:14 -08:00
Kyle Spier-Swenson
675b0bc500 Removes comment that is no longer needed 2016-01-02 20:04:54 -08:00
MrStonedOne
b50e8d2a63 removes a bunch of unneeded spawns 
spawns have a high overhead.

I only went for easy targets, almost every spawn could be removed with a few subsystems in place to handle delays or cooldowns
 2016-01-02 18:23:02 -08:00
Shadowlight213
5662676e5e Makes attacks also log to the mob's mind.dm 
Shows gibbed antags in the check antags panel.
 2016-01-02 17:20:19 -08:00
duncathan
b18c6c2c5c Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos 
Conflicts:
	nano/assets/nanoui.js
	nano/bower.json
	nano/templates/atmos_filter.dot
 2016-01-02 18:02:54 -06:00
Kyle Spier-Swenson
b052e8367f Update debug.dm 2016-01-02 04:07:16 -08:00
Kyle Spier-Swenson
85c037ffe7 Fixes byond trying to create a new /world/ object on admin proc calls 
This SHOULD work
 2016-01-02 03:25:31 -08:00
tkdrg
471b31739b Merge pull request #14210 from KorPhaeron/construct_names 
Fixes construct names in player panel
 2016-01-01 18:48:04 -03:00
Cheridan
9eef40c33f Merge pull request #14190 from tkdrg/lmao 
Fixes create revolutionares bugs
 2016-01-01 00:46:02 -06:00
Cheridan
92ba9dd695 Merge pull request #14147 from tkdrg/steelth 
Stealthmin Improvements
 2015-12-31 22:24:03 -06:00
KorPhaeron
f18eda7df2 Names 2015-12-31 15:04:05 -06:00
Tkdrg
3b1553cb8c Fixes create revolutionares bugs 
Fixes create revolutionares feedback message
Fixes creating revs on z levels other than 1

Fixes #14189
Fixes #14161
 2015-12-31 04:19:32 -03:00
tkdrg
52a45b6292 Merge pull request #12935 from AndrewJacksonThe2nd/objectives_rework 
OBJECTIVES REWORK: Better Objectives Generation
 2015-12-31 03:11:41 -03:00
duncathan
8392974ad0 fixes associative list; adds gas_overlay to "datum gases" 2015-12-29 22:50:09 -06:00
Cheridan
a40b732fe4 Merge pull request #13943 from tkdrg/abos 
Checking antagonists will now message admins
 2015-12-29 15:02:00 -06:00
duncathan
17f167bcb7 associative list 2015-12-29 13:33:12 -06:00
Tkdrg
2a08622b7e Stealthmin Improvements 
Removes stealthmins from the orbit list and makes them invisible.
Remember to always use dsay instead of say to avoid the (F) links!
 2015-12-29 15:09:27 -03:00
Remie Richards
dcea576585 Merge pull request #14063 from tkdrg/you_are_now_breathing_manually 
Manual bans will now add notes automatically
 2015-12-29 07:05:53 +00:00
Remie Richards
7ae7fa0d88 Merge pull request #14113 from tkdrg/DUPES 
Adds a "dupe marked datum" option to Game Panel
 2015-12-29 07:04:14 +00:00
duncathan salt
b943109a02 Merge pull request #13905 from KorPhaeron/weather 
Weather datums [WIP]
 2015-12-28 22:06:31 +01:00
AndrewJacksonThe2nd
dca91323a4 Merge branch 'master' of https://github.com/tgstation/-tg-station into objectives_rework 
Conflicts:
	code/datums/mind.dm
	code/game/gamemodes/antag_spawner.dm
	code/game/gamemodes/objective.dm
	data/mode.txt
 2015-12-28 12:40:51 -08:00
duncathan
cc9c5768ca Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos 
Conflicts:
	code/datums/gas_mixture.dm
 2015-12-28 13:59:16 -06:00
duncathan
b18cb5fca8 making shit compile 2015-12-28 08:31:20 -06:00
Tkdrg
a87ea29c84 Adds a "dupe marked datum" option to Game Panel 
Useful when something bugs out in-game and you want to test it without
fucking the original up, or maybe if you want to spam some varedited
item quickly.
 2015-12-28 01:45:33 -03:00
tkdrg
1dec16cbb9 Merge pull request #13936 from Shadowlight213/AdminAIToggle2 
Makes Admin AI interaction a logged toggle. Take 2
 2015-12-27 22:01:01 -03:00
Tkdrg
dbc6dc5957 Manual bans will now add notes automatically 
Just some QoL. You should still avoid those if you can help it, though.
 2015-12-26 10:59:06 -03:00
duncathan salt
ede1cdb511 Merge pull request #13960 from AnturK/nuclearoption 
Random fixes
 2015-12-24 14:12:24 +01:00
Tkdrg
575f47988a Checking antagonists will now message admins 2015-12-24 00:43:06 -03:00
tkdrg
02aff598b2 Merge pull request #13852 from RemieRichards/AdminQuickMapDrop 
Map Template Load Verb + Maploader Improvements
 2015-12-23 17:51:20 -03:00
Remie Richards
965b6642ad smarter extension detection 2015-12-23 20:34:31 +00:00
AnturK
503a8a3557 Fixes SQDL2 paren escaping 2015-12-23 12:27:24 +01:00
Shadowlight213
deac088c47 Adds a toggle for Admin AI interaction and makes it logged. 
Also fixes Admin interaction with emagging borgs via the robotics console
 2015-12-22 18:24:18 -08:00
Remie Richards
67c71b5961 Allows admins to upload a map template to be used by themselves or other admins, does NOT persist between rounds. 2015-12-23 02:24:08 +00:00
KorPhaeron
70060cb6c1 Weather datums 2015-12-22 05:31:46 -06:00
AnturK
7145db861f Fixes check antagonists not displaying bursted blobs 2015-12-21 20:08:05 +01:00
tkdrg
96855b3094 Merge pull request #13800 from KorPhaeron/voices 
Prayer response voice is generalized again
 2015-12-21 03:16:31 -03:00