cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-19 05:26:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,385 Commits 61 Branches 14 Tags
245dc528338eafd6ccd540f856423ebbda012f7d
Commit Graph

4676 Commits

Author SHA1 Message Date
Rockdtben
d3f2befb54 Merge pull request #2293 from Faerdan/master 
NanoUI Update
 2014-01-11 13:42:32 -08:00
Cheridan
d2a92b3063 Merge pull request #2260 from Giacom/recycler_emag 
[MAP] Re-added the recycler's emag functionality and changed it so that it does massive brute damage and eats the person's equipped items
 2014-01-11 12:27:13 -08:00
Giacom
c8120da49c Merge pull request #2283 from YotaXP/list2text-refactor 
Optimized and refactored list2text, text2list, and replacetext.
 2014-01-11 10:11:13 -08:00
YotaXP
cb0516f909 Corrected my own grammar failings. 2014-01-11 12:51:42 -05:00
Aranclanos
baa86c8819 Merge pull request #2305 from Giacom/removed_set_background 
Disabled the game using "set background" by making all instances of it use a define
 2014-01-11 08:14:15 -08:00
Giacom
c1d228a96e Merge pull request #2282 from Cheridan/Magic 
Upgradeable Laser Pointers!
 2014-01-11 06:09:19 -08:00
Giacomand
26d7a263bf Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/2251 2014-01-11 14:06:36 +00:00
Giacomand
1a41abc609 The wire dialog will now properly close. 
Refactored some of the code into procs.
Small feature: bombs tick louder when they are 10 seconds or less left, nuclear bombs were given the same treatment but with 20 seconds.
Fixed a bug with the syndicate bomb wire datum not using the CanUse().
 2014-01-11 14:05:51 +00:00
Giacom
03eea5642c Merge pull request #2257 from errorage/2014_01_06_borg_module_ui_update 
Cyborg module selection UI update
 2014-01-11 04:33:03 -08:00
Giacom
7b5e401ee6 Merge pull request #2275 from JJRcop/nuke-toy 
Adds new nuke toy
 2014-01-11 04:22:20 -08:00
Cheridan
c10d9b2611 fixing my fixes 2014-01-10 14:10:30 -06:00
Giacomand
f1e7637bab Disabled the game using set background by making all instances of it use a define, which can be changed in code/_compile_options.dm 
Testing has revealed that it reduces the sluggishness of the game, though it will spike from lag when the singularity is loose. Thanks to ChuckTheSheep for suggesting it.

Server owners who want to keep set background enabled can do so by changing the define.
 2014-01-10 18:32:28 +00:00
Giacom
4304107d26 Merge pull request #2242 from ChuckTheSheep/Morgue-Changes 
Morgue Changes
 2014-01-10 08:19:33 -08:00
Giacomand
5d177d8079 Merge branch 'master' of https://github.com/tgstation/-tg-station into recycler_emag 
Conflicts:
	maps/tgstation.2.1.2.dmm

Fixed the map of the mineral machinery input/output bugs.
 2014-01-10 13:19:56 +00:00
Aranclanos
769e9dd9a7 Merge pull request #2137 from Rumia29/23/12/2013-rdaltuniform 
Adds an alt RD uniform to the RDs locker
 2014-01-10 00:52:09 -08:00
Aranclanos
3d6eb6dd3d Fixed tables not working 2014-01-09 18:54:54 -03:00
Mark Aherne (Faerdan)
fef1a108fb Merge branch 'master' of https://github.com/tgstation/-tg-station 2014-01-09 01:03:40 +00:00
Mark Aherne (Faerdan)
53b2d2e928 NanoUI Update 
* Refactored the code used in the ui_interact procs to be neater and easy to understand (also less code duplication). Updated all existing ui_interact procs to match.
* Rebuilt (and simplified) template rendering system, removed data-linking (the use of carets "^" in templates) and the need to send the full data structure every update (just send whatever you want now, it's fully dynamic). Updated all existing templates to match.
* Restructured HTML and JavaScript to increase compatibility with IE (this fixes "blank uis" for many users).
* Increased the number of error messages to help diagnose issues.
* Multiple performance improvements, especially when updating an open ui.
* Added the ability to update a ui for an individual user (nanomanager update_user_uis proc, used for things like realtime messages in Bay's PDA).
* Added a "Loading..." notice to the UI. If this stays then your JavaScript isn't enabled.
* Removed redundant wip apc.tmpl file.
* Added a link to the online docs in TemplatesGuide.txt.
 2014-01-09 01:02:13 +00:00
ChuckTheSheep
8e050332d6 Cleans up the for() and list handling in update. 2014-01-08 18:12:17 -05:00
Giacom
cac61b9d0c Merge pull request #2273 from Razharas/WhyAIsDontHaveMentalInterfaceFailuresIDontKnow 
Fixes AI being carded issue
 2014-01-08 11:00:53 -08:00
Cheridan
397b2f07e8 fixes 2014-01-08 10:42:12 -06:00
JJRcop
0ef530326a Minor nuke toy edit 
Moved the user.visible_message call out of spawn()
Removed the now obsolete sleep() call and put the delay in spawn()
 2014-01-08 09:52:00 -05:00
Cheridan
46aefa1671 Merge pull request #2272 from ChuckTheSheep/OOC-color-selection 
OOC Color Default In Input
 2014-01-07 23:39:25 -08:00
YotaXP
f98a57b750 Optimized and refactored list2text, text2list, and replacetext. 
Also fixed some grammar in the station blueprint code.
 2014-01-07 22:15:25 -05:00
Cheridan
937ac275ff Upgradeable Laser Pointers! 
Laser pointers can be upgraded with laser stock parts, which increases the odds of hitting a target.
Whee!
 2014-01-07 19:54:51 -06:00
Incoming
7418700cce Adds a badmin bomb that lets you var edit the explosion (for pure firebombs and stupid huge explosions [remember to toggle the bombcap first]) 
Changes how wire shuffling works to cut down on abandoned wires.

Removes a rogue processing_objects I missed before
 2014-01-07 20:50:25 -05:00
JJRcop
01f229a60d Adds "surround" arg to playsound, which enables 3D sound 
Defaulted to on
Also changes the toy nuke to use it
 2014-01-07 17:45:12 -05:00
Razharas
e468ea24d1 I dont have one so no idea hows it spelled 
Fuck you grammer
 2014-01-07 22:01:08 +04:00
Razharas
a4780069d3 Merge branch 'master' of https://github.com/tgstation/-tg-station into WhyAIsDontHaveMentalInterfaceFailuresIDontKnow 2014-01-07 21:58:16 +04:00
Cheridan
0665ff4125 Merge pull request #2264 from Giacom/disposal_outlet_runtimefix 
Fixes the disposal outlet runtiming.
 2014-01-07 08:42:21 -08:00
Cheridan
afd6b5fa22 Merge pull request #2266 from fleure/janradio 
Gives janitor service headset
 2014-01-07 08:37:24 -08:00
JJRcop
1300e3ebf3 Adds a visible_message to the nuke toy when it is used 2014-01-07 11:20:19 -05:00
Cheridan
1a58a3cf86 Merge pull request #2265 from fleure/watertank 
Reduced watertank slowdown slightly
 2014-01-07 08:16:10 -08:00
Cheridan
34fad5272b Merge pull request #2262 from Razharas/NoIReallyCant 
Fixes cloning not working properly
 2014-01-07 07:44:44 -08:00
Giacom
9602bd2c14 Merge pull request #2256 from Aranclanos/RRpls 
Half of the runtimes of four days here
 2014-01-07 06:24:57 -08:00
Giacom
dbfb8ca052 Merge pull request #2254 from Razharas/Text2PathFix 
Fix of mech fabricator
 2014-01-07 06:24:12 -08:00
Razharas
ca0423ee9c Fixes AI being carded when not in the core 
Yep thats it
Fixes #1862
Fixes #2271
 2014-01-07 11:55:34 +04:00
ChuckTheSheep
b5ba90cc6f OOC Color Default In Input 
Added the "default" field in the input when selecting an OOC color so
that it starts on the current color instead of black.
 2014-01-07 01:04:45 -05:00
ChuckTheSheep
676dc5269a Moved Login/Logout to their defined files 2014-01-06 21:25:10 -05:00
ChuckTheSheep
9f314fcb07 Made the Login/out()s involved under mob 2014-01-06 21:20:36 -05:00
ChuckTheSheep
1d7858d54f Fixes regarding path case 2014-01-06 18:01:28 -05:00
Cheridan
58159a00ad Merge pull request #2105 from RobRichards1997/20/12/2013-Poker_Tables 
Poker tables
 2014-01-06 14:35:03 -08:00
JJRcop
94ef52e1cd Adds new nuke toy, plays nuke sound when attack_self'd 
Cooldown of 5 minutes
 2014-01-06 16:46:12 -05:00
Cheridan
49da9996ef Merge pull request #2228 from Incoming5643/LOGDEMSPELLS 
[Maniac Mansion] Adds attack logging to learning spells from one time use spellbooks
 2014-01-06 13:40:04 -08:00
Giacom
a219896082 Merge pull request #2241 from ChuckTheSheep/explosiveoptimization 
Explosion Optimizations
 2014-01-06 13:07:05 -08:00
Giacomand
a5b440d296 Added a stat check before say(). 2014-01-06 20:27:59 +00:00
Fleure
c50255107a Gives janitor service headset 2014-01-06 18:51:22 +00:00
Fleure
333d0ed045 Reduced watertank slowdown slightly 2014-01-06 18:26:06 +00:00
Giacomand
f0a8e2bc76 Fixes the disposal outlet runtiming. The removed code, which was causing the runtime, wasn't even doing anything and was just setting "throwing" to 2 for no reason. 2014-01-06 18:20:59 +00:00
Giacomand
539f3e0483 All non-carbon mobs will still be gibbed, robots will survive with their MMI. 2014-01-06 17:45:38 +00:00