cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-23 07:26:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,360 Commits 61 Branches 14 Tags
bf25d38fb2cb392ebeef7bda5c3f16fc07f2cc24
Commit Graph

291 Commits

Author SHA1 Message Date
Ergovisavi
ff68a2d55b Merge pull request #6490 from tkdrg/nomoreadmingrudges 
Adds cfg option to let players see their own notes
 2014-12-27 19:25:43 -08:00
tkdrg
45904bb8a2 Merge pull request #6425 from JJRcop/OOCemoji 
Adds emoji to OOC chat [Now with in-house sprites!]
 2014-12-27 03:01:36 -03:00
tkdrg
9d7567f46d Adds cfg option to let players see their own notes 
This lets players see the admin notes that have been added to their
ckey, by using a verb in the OOC tab.
This is a config option and is off by default.
 2014-12-19 22:42:18 -03:00
tkdrg
524291f97c Adds a voting link to the "Vote available" message 2014-12-19 20:57:02 -03:00
JJRcop
fa18eaa164 Renames game_options.txt OOC_EMOJIS to EMOJIS 
Moves config check into emoji_parse proc, so the config affects all emoji use
 2014-12-17 12:48:41 -05:00
JJRcop
8f2fab79d3 Adds emoji to OOC chat. 2014-12-17 00:10:51 -05:00
Wild Bill
66d36f74d2 Reserve PascalCase inits 2014-12-16 12:29:04 +02:00
Hornygranny
af3f1aa4d8 Merge remote-tracking branch 'remotes/upstream/master' into emagrefactor 
Conflicts:
	code/game/machinery/deployable.dm
	code/game/objects/items/weapons/storage/lockbox.dm
	code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
	code/modules/clothing/glasses/hud.dm
	code/modules/mob/living/silicon/robot/robot.dm
 2014-12-09 16:03:45 -08:00
Swag McYolosteinen
bff2e62a0f Merge pull request #6175 from Razharas/ExActFix 
Fixes ex_act() destroying too much shit
 2014-12-08 08:03:35 +01:00
Razharas
7758a0afed Ok now explosions shall work properly 
Changed severity to target, make items not destroy themselves on
severity lower than 1, all that stuff
 2014-12-05 23:21:48 +03:00
tkdrg
6194c0b90f Fixes the new AI lawcap config option 
Previously, it would include null entries in some of the lists, which
meant that the total law amount would be grossly exaggerated.

Fixes #5846
 2014-12-02 18:27:06 -03:00
Intigracy
8a1baad03b forgot the var / proc 2014-11-27 14:50:21 -08:00
Intigracy
31835f1987 Removes the unused explosion_recursive.dm and everything related to it, including the configuration option. 2014-11-27 14:28:20 -08:00
Razharas
c5209f2399 Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour 2014-11-27 15:30:37 +03:00
Razharas
b41303714d Fixes light going through walls 
Fixes #2788
 2014-11-21 17:16:54 +03:00
Hornygranny
678a13c451 moves emag effects from attackby() into atom proc emag_act() 2014-11-20 17:49:06 -08:00
Razharas
ff456ebaf4 Unwinded most of shit 
Meh
 2014-11-19 21:36:45 +03:00
Razharas
b7d08c591e Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour 2014-11-18 16:23:04 +03:00
Razharas
b071a0167e Made explosions work in a slightly different way 
Yep
 2014-11-18 16:22:41 +03:00
Menshin
56cf16b3ab * Fixed supply comp/order comp href exploit (being able to order any supply pack, even if not hacked/contraband enabled). 
* HTML tags are now properly stripped from inputted text
* Syndicates crates are now orderable.
 2014-11-14 13:14:22 +01:00
Cheridan
24456bcc22 Merge branch 'PipenetRevamp' of https://github.com/Aranclanos/-tg-station into Aranclanos-PipenetRevamp 
Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
	code/ATMOSPHERICS/atmospherics.dm
	code/ATMOSPHERICS/components/portables_connector.dm
 2014-11-13 18:55:53 -06:00
hornygranny
1cbfe107b5 Merge pull request #5751 from Miauw62/blugh 
Fixes border window phasing.
 2014-11-10 08:15:46 -08:00
hornygranny
62003a8ab8 Merge pull request #5700 from RemieRichards/SiliconLawCap 
Adds a config option to cap silicon laws. [NEW CONFIG OPTION]
 2014-11-08 15:22:09 -08:00
Miauw
c275a9394d Fixes being able to phase through windows using grabs. Fixed #3957 
Fixes the supply shuttle safety applying when it is at centcomm. Fixed #3808
 2014-11-08 13:21:55 +01:00
Remie Richards
177225598b Adds a config option for capping the amount of laws silicons can receive via boards, defaults to 12 2014-11-05 22:25:46 +00:00
hornygranny
3d09f8031a Merge pull request #5632 from GunHog/Botcall_Lagfix_TryTwo 
Botcall Fix for MC lag + Tweak to floorbots Take Two
 2014-11-03 17:35:16 -08:00
hornygranny
b32e9cff12 Merge pull request #5621 from tkdrg/damnoldcoders 
Moves around some vars
 2014-11-03 17:15:54 -08:00
GunHog
7f41894319 Gives bots their own place in the MC! 
- Adds bots to the Master Controller as their own datum instead of
machines.
- Puts bots into their own global list.
- Processes bots asynchronously so as to not hold up the MC processing
them.
 2014-11-03 12:39:07 -06:00
Aranclanos
5a237e6854 Merge branch 'master' of https://github.com/tgstation/-tg-station into PipenetRevamp 2014-11-03 08:34:47 -03:00
Aranclanos
8aa5a137c5 Pipenet revamp 
-Removed the pipenet network datum, now it will all be done with the pipeline datum
-All atmos pipes and machines will always have a pipeline datum
-Moved the valves to the binary subtype and the portable connectors to the unary subtype
-The pipe vents (who were barely used in three spots of the map) are removed, the map slots will replaced with outlets
-Fixes some bugs of pipenet disconnection, mostly on explosions
-Cleaned a bit the copypaste of construction.dm of pipes
-Removed the ID restrictions of digital valves and the frequency (both unused)
 2014-11-03 08:21:31 -03:00
tkdrg
a97c4de972 Moves m_amt, g_amt, reliability and origin_tech to /obj/item (previously in /obj) 
Removes force from pipes
Removes unused turf var icon_old
Moves pass_flags to /atom/movable
 2014-11-02 14:10:03 -03:00
tkdrg
f995b2e94b Adds cargo and secrecords to admin_investigate 2014-10-31 23:20:33 -03:00
scoopscoop
9d98640bc7 The supply shuttle, supply ordering, ore redemption and mining vendor consoles in cargo now use datum/browser/popups instead of user << browse so they don't look like random HTML pages. 2014-10-23 15:26:33 +03:00
hornygranny
20329a3bdb Merge pull request #5240 from paprka/assantag 
Assistant antagonist config option
 2014-10-20 20:19:08 -07:00
phil235
45cfe07f98 Merge branch 'master' of https://github.com/tgstation/-tg-station into DisplacedGirderFix 
Conflicts:
	code/modules/recycling/disposal.dm
 2014-10-15 18:23:40 +02:00
phil235
dbea503e88 Removing the fourth argument (air_group) of CanPass() everywhere, because it isn't used anywhere. 
Fixing one instance of "for(mob in viewers) show_message()" to "visible_message()"
 2014-10-15 18:03:06 +02:00
paprka
37860bc09b typo and comment fixes in configuration.dm 2014-10-13 17:40:56 -07:00
paprka
c0425bc06e initial commit of assistant antag option 2014-10-13 17:21:02 -07:00
Cheridan
f96b017149 Merge pull request #5097 from phil235/Msg1Fix 
Fixing a lot of messages
 2014-10-07 12:09:01 -05:00
Remie Richards
d82ac08d3c Merge pull request #5082 from Menshin/space_transitions_fixes 
Space transitions/Away missions loading fixes
 2014-10-06 14:14:01 +01:00
phil235
dd7a3b7fbc Merge branch 'master' of https://github.com/tgstation/-tg-station into Msg1Fix 
Conflicts:
	code/modules/admin/admin_verbs.dm
 2014-10-05 13:48:11 +02:00
Cheridan
08be1b34eb Revert "Changes a few green crosses to blue on sprites that I missed last time" 2014-10-04 19:22:10 -05:00
phil235
537280b4b9 Removing many instances of the no longer used second argument of message_admins() proc. 
Replacing "for(var/mob/M in viewers()) M.show_message()" by "visible_message()" or audible_message()" in many places.
Changing a few span classes.
 2014-10-05 01:29:30 +02:00
Menshin
b76b3fa298 * The Space Cube is now generated at world start, before away missions are loaded 
This means away missions don't have space transitions
* The setup_map_transition proc is protected from excessive tiles proceeding (the proc is set to the background if too much tiles are processed)
* Added a comment explaining the Space Cube, by Incoming
* Fixes #4903 : "mobs don't maintain momentum on z-level transition"
* Serendipitiously fixes #2614
 2014-10-04 21:16:23 +02:00
Remie Richards
cd53199398 Merge pull request #5004 from Menshin/malf_timer_fixes 
Malf timer polishing/fixes
 2014-10-03 21:41:15 +01:00
Cheridan
c2f6469a04 Merge pull request #4953 from Aranclanos/mastercontroller 
Stops the master controller New() from reloading away missions.
 2014-10-02 14:36:50 -05:00
Cheridan
eebc00e0ae Merge pull request #5014 from Ikarrus/redalerttime 
Calling the shuttle during Red Alert will now announce the correct time
 2014-10-01 09:56:19 -05:00
Cheridan
4dcc265d76 Merge pull request #4960 from Incoming5643/zlevel 
[map] Predictably Random Z-levels and the SPACECUBE
 2014-09-29 10:42:49 -05:00
ikarrus
02df67e8df Calling the shuttle during Red Alert will now announce the correct time 
Instead of 10 minutes every time.
 2014-09-28 17:52:46 -06:00
Menshin
ed807f8538 * Polished the malf timer logic 
* added a protection to prevent division by 0 when all hacked apcs are destroyed
* added a midnight rollover check for the MC (fixes #4905)
* toggling breakers won't add/remove a hacked APC from the AI apcs pool anymore
 2014-09-28 12:16:21 +02:00