cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-15 03:27:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,094 Commits 61 Branches 14 Tags
e0bbfbacc112e0a7aefb03f45f9921861003a9c8
Commit Graph

1366 Commits

Author SHA1 Message Date
MrStonedOne
7605f5bf27 Makes log viewing use ftp() over run() 
This will give the admin a save file dialog.

This is because byond seems hell bent on getting rid of run()
 2015-07-07 21:14:55 -07:00
Cheridan
65484c6457 Merge pull request #10419 from Ikarrus/gangbadmin 
Fixed Badmins being able to exceed the gang limit with excessive buttons
 2015-07-07 08:57:30 -05:00
Ikarrus
b1d8d049c1 Renames duplicate random_name() proc 2015-07-06 20:15:47 -06:00
Ikarrus
d3ea1c7902 Fixed Badmins being able to exceed the gang limit with excessive button pressing 2015-07-06 00:05:59 -06:00
Ikarrus
5e50b2b982 Update and Changelog 
Lizard names are now "name1-name2"
 2015-07-05 22:20:00 -06:00
Ikarrus
b0cfaf401f Random Names for Lizards 
Lizards now have their own list of names to pull from when randomizing their names.
 2015-07-05 18:35:56 -06:00
Swag McYolosteinen
a4b60449f8 Merge pull request #10129 from AnturK/ayy 
Abductors fixes and improvements
 2015-07-04 16:57:10 +02:00
Cheridan
7b6867bc21 Merge pull request #10328 from Ikarrus/datumgangs 
Datum-Based Gangs [Ready]
 2015-07-03 10:35:07 -05:00
Jordie
d76d552285 Merge pull request #10327 from MrStonedOne/patch-18 
Fixes special characters not working in asay/apm
 2015-07-03 17:08:35 +10:00
Razharas
572121ecc4 Merge pull request #10244 from Ikarrus/workplacesafety 
Workplace "Accidents"
 2015-07-03 05:05:36 +03:00
Ikarrus
2191a2c33d Datum-Based Gangs 2015-07-02 15:12:55 -06:00
MrStonedOne
7ba58e834b Fixes special characters not working in asay/apm 2015-07-01 20:24:52 -07:00
Ikarrus
55bec2d24d Adds a thrownby var that's used by admin logging. 2015-07-01 13:00:12 -06:00
Jordie0608
3b33a3da9f Merge branch 'master' of https://github.com/tgstation/-tg-station into ss13countsasaweaponofmassfrustration 
Conflicts:
	code/game/gamemodes/nuclear/nuclearbomb.dm
	icons/obj/machines/bignuke.dmi
 2015-07-01 19:41:00 +10:00
Remie Richards
cd36b1665b Merge pull request #10202 from nullstation/hi-extended 
HTML interface module: Port of the crew monitoring computer
 2015-07-01 05:59:39 +01:00
Razharas
eb4d6c66a5 Merge branch 'master' of https://github.com/tgstation/-tg-station into VarEdit 2015-06-29 13:42:23 +03:00
AnturK
58f74302b0 Fixes spawning teams. Maybe. 2015-06-28 14:28:50 +02:00
nullquery
a6ce6abfe3 Merge pull request #8 from nullstation/master 
Merge with upstream
 2015-06-28 07:09:40 +02:00
MrStonedOne
9a64d1db9e Removes duplicate variable in adminhelp. 2015-06-27 16:49:39 -07:00
MrStonedOne
d9da2290e8 Cleans up adminhelp keyword searcher and changelog for #10196. 2015-06-27 13:03:47 -07:00
Razharas
3d556ea970 Some varedit improvements 
Fixed give spell window hiding most important part of the spell types
Added call proc to varedit so all things you can open in varedit you can
also call procs on
 2015-06-27 18:00:57 +03:00
NullQuery
3ac02c82e5 Fix for the "Populate world" verb. 2015-06-27 10:56:35 +02:00
NullQuery
b4248b01e4 - Crew monitoring computer using the html_interface module 
- Patch: Don't update html_interface clients that have been inactive for more than 10 minutes.
- Patch: Attempt to speed up _renderContent some more (in case of multiple clients) by using spawn.
- Patch: Second argument for hiIsValidClient hook: reference to the current html_interface object (used by crew monitoring computer).
- Feature: procqueue singleton. You can use this to put proc executions on a queue. Used by the crew monitoring computer to queue the update "for the next tick" when humans move.
 2015-06-27 10:26:46 +02:00
MrStonedOne
0aeffb3c0f Admin help tweaks. 
The keyword scanner (thing that adds (?) links to player names in admin helps) has been moved to its own proc.
This has been added to all admin pms.
It has been added to asays as well, with the (FLW) link removed to avoid it being distracting.

Replying to an admin help (but not other forms of admin pms nor admin pm replies) by clicking on the name of the ahelper will now send a message to all admins letting them know you are typing up a reply to it. (this should avoid mutiple people replying to the same ahelp) (It also sends a message if you escape out of the ahelp reply as well)
 2015-06-26 16:30:37 -07:00
Cheridan
b9cdb3384a Merge pull request #9932 from Jordie0608/mycomputerismadewithoverlayswhyisntyours 
Icon and code improvements to fancy storage, cigarette packs, lighters, droppers and syringes
 2015-06-26 15:34:24 -05:00
Jordie0608
d3f78294ad fixes edit reason and log for follow 2015-06-26 16:13:40 +10:00
Jordie0608
58399f7602 Merge branch 'master' of https://github.com/tgstation/-tg-station into mycomputerismadewithoverlayswhyisntyours 
Conflicts:
	icons/obj/items.dmi
 2015-06-24 20:31:51 +10:00
Jordie0608
29d7122095 Merge branch 'master' of https://github.com/tgstation/-tg-station into idkhowtheserverevenranwiththiserroraround 2015-06-24 16:48:17 +10:00
Jordie
dbad5fdea4 critical fix to admin memos 2015-06-24 15:58:41 +10:00
Cheridan
c7e0b96314 Merge pull request #10083 from MrStonedOne/ISTHISVALID 
Admins can now reject shitty adminhelps
 2015-06-23 14:26:11 -05:00
Jordie0608
d6018caf86 breaks nuke's topic into procs so it works better with toggle_nuke 2015-06-23 21:49:13 +10:00
Cheridan
7b6fdbc8ce Merge pull request #9556 from Jordie0608/thisisnothebeginningoftotalatarinismthathappenedearlier 
Ports watchlist flagging for ckeys
 2015-06-22 23:36:06 -05:00
MrStonedOne
40c2ca5966 Tweaks adminhelp rejections and adds changelog 2015-06-21 13:23:42 -07:00
MrStonedOne
9583b1213b Adds new timer subsystem 
Adminhelps now use it so that they can cancel the timer to return the admin help verb.
Adminhelps now allow admins to reject the adminhelp, giving the user back the verb and a message telling them how to construct a better admin help.
 2015-06-21 11:55:38 -07:00
Jordie0608
25445e5a05 Merge branch 'master' of https://github.com/tgstation/-tg-station into mycomputerismadewithoverlayswhyisntyours 
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
 2015-06-20 17:32:16 +10:00
Cheridan
a2948ba203 Merge pull request #9956 from Jordie0608/whocodesthecodemen 
Various admin improvements
 2015-06-20 00:53:30 -05:00
phil235
f976ae8a58 Merge pull request #9957 from MrStonedOne/boomboomshaketheroom 
Makes the bomb cap a config option.
 2015-06-17 14:17:09 +02:00
Jordie0608
0bf6f09969 Merge branch 'master' of https://github.com/tgstation/-tg-station into whocodesthecodemen 
Conflicts:
	code/modules/admin/verbs/pray.dm
 2015-06-16 17:24:20 +10:00
Jordie0608
34fb8cc8bc toggle nuke and set sec level button, flamethrower logging 2015-06-16 17:19:56 +10:00
phil235
ae8c69f9a7 Merge pull request #9955 from kingofkosmos/spanspaceremoval 
Unnecessary space removal from spans and messages
 2015-06-15 18:20:04 +02:00
Cheridan
ec8cd61d4c Merge pull request #9808 from Incoming5643/march_of_the_snowflakes 
WJohn's Hyper Customizable Lizard Sprites
 2015-06-14 17:40:20 -05:00
MrStonedOne
7cfff6f1ca Secrets clean up/configurable bomb cap 
Moves Secrets to it own file so its not stinking up admins.dm and topic.dm

Makes the bombcap configurable rather then being a per-round only thing.
 2015-06-14 09:08:27 -07:00
MrStonedOne
8079872d35 Makes changing the bomb cap more fine grain 
Also changes the other 2 bomb cap values
 2015-06-14 07:38:40 -07:00
Jordie0608
a67de221cc JMP replaced with FLW, fixes and adds a bunch of key_name checks in adminlogging 2015-06-14 23:37:35 +10:00
kingofkosmos
c8d79e7034 Removed unnecessary spaces in these situations: 
"span class = '" changed to "span class='"
"'> " changed to "'>"
 2015-06-14 12:13:19 +03:00
Jordie0608
3e07dbc5a9 Merge branch 'master' of https://github.com/tgstation/-tg-station into mycomputerismadewithoverlayswhyisntyours 
Conflicts:
	icons/obj/chemical.dmi
 2015-06-13 20:23:29 +10:00
Razharas
29730ce479 Merge pull request #9412 from RemieRichards/ReactionaryExplosions 
Ports VG's DeityLink's new explosion method
 2015-06-13 04:45:23 +03:00
Razharas
486888f801 Merge pull request #9630 from AnturK/vv_assoc 
Fixes varediting associative lists
 2015-06-13 04:44:24 +03:00
Razharas
ec6c0465b5 Merge pull request #9879 from Incoming5643/skeleton_man 
Magic Mania 1.91: Life's a lich and then you rework the mechanic to be less terrible
 2015-06-13 04:24:38 +03:00
Incoming
595bb0c8e4 Generalizes lizard parts to "features" for future non-lizard fields, at the same time merging mutant color into this list 
Random lizard bodies will finally have color!

Pushes features almost all the way to the DNA side of thing, the mob side is only needed during character creation.

Note that changes to the save file will invoke a one time per character runtime for legacy characters as the save file purges mutant_color, this is as far as I can tell harmless, has no effect on the player, and is self correcting.
 2015-06-12 00:43:35 -04:00