cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-14 10:53:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,384 Commits 62 Branches 14 Tags
73005ca98253fffca2877dc04a7e291d8099dc59
Commit Graph

2117 Commits

Author SHA1 Message Date
Jesus Hussein Chris
68a6131c22 Fixes bugs that prevent spawning dead slimes and dead monkeys before roundstart. 2014-01-13 12:38:31 +13: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
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
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
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
dff02e49eb Merge branch 'master' of https://github.com/tgstation/-tg-station into recycler_emag 2014-01-10 13:21:34 +00: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
203264b124 Merge pull request #2268 from Giacom/last_breath 
While in critical you can whisper your final breath, it will result in you immediately dying afterwards, like in the movies!
 2014-01-10 05:15:54 -08:00
Giacomand
3626454719 The final whispering uses succumb, which will log their will to die. 
All living mobs can now use InCritical(), humans override it.
 2014-01-10 12:35:34 +00:00
Aranclanos
3993fbe9b5 Merge pull request #2288 from ManeaterMildred/WHYISRUNTIMEORANGEWHENDEADOHGOD 
Fixed the highly important bug that made Runtime orange when dead.
 2014-01-10 01:49:38 -08:00
Balrog
98f0e4447c Fixed typo in augmented limb weld message 2014-01-08 17:14:57 -05:00
ManeaterMildred
c29b3fcb52 Fixed the highly important bug that made Runtime orange when dead. 2014-01-08 20:53:08 +01:00
Giacomand
ddb52452a1 Final whispers will use the Elipses proc for extra tension. 
The Elipses proc got a new argument which disables replacing words with ..., and instead just adds them.
 2014-01-08 18:50:38 +00: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
Robson Richards
e83928a6ac Span classes 2014-01-07 21:12:16 +00:00
Cheridan
b2108a98ac Merge pull request #2246 from Giacom/followme 
Made the ghost follow verb less buggy.
 2014-01-07 08:54:00 -08:00
Giacom
7cb6fcb5dc Merge pull request #2243 from Cheridan/Ninja 
Ninja Death Tweak
 2014-01-07 06:34:35 -08:00
ChuckTheSheep
5eb6491c0c Whoops 2014-01-06 21:27:50 -05:00
ChuckTheSheep
676dc5269a Moved Login/Logout to their defined files 2014-01-06 21:25:10 -05:00
Giacomand
7551dd38a8 Changed "his" to "their" 2014-01-06 23:24:47 +00:00
Giacomand
8c1a8f072c Added a check for being unconscious and not in critical. 2014-01-06 21:52:41 +00:00
Giacomand
a0eac7b352 While in critical you can whisper your final breath, it will result in you immediately dying afterwards, like in the movies! 
How much you can say is dependent on how far away you are from death, the closer the less you can say.
 2014-01-06 21:41:14 +00:00
Giacomand
e3bb626ce9 * Removed an unnecessary update_icons() 2014-01-06 19:01:12 +00:00
Giacomand
6ab6f4ada0 Re-added the recycler's emag functionality and changed it so that it does massive brute damage and eats the person's equipped items. 
The blood on the recycler is now scannable by a forensic scanner.
Fingerprints will now properly show up on the recycler.
The status effect procs will now properly update the can_move()
Admins can now possess the recycler to properly get it to gib people that it moves into.
The mineral stacker in disposals will now release stacks of 10.
 2014-01-06 17:21:13 +00:00
errorage
4d7e53c083 - Clicking on an item in your modules list now instantly moves it, the delay between click and it moving to the active module slot, which is seen in the video, is no longer there. 2014-01-06 16:43:25 +01:00
errorage
bfcd050b77 Partial commit for the cyborg UI upgrade, which gets rid of the pop-up window for module selection, instead displaying the available modules in storage-item like fashion. 2014-01-06 12:17:07 +01:00
Giacomand
16b35bf32f Made the follow verb less buggy. 
Removed duplicated code.
 2014-01-05 17:44:46 +00:00
Nienhaus
9e798d1890 Side Part hair 
Someone requested side parted hair so I did it.
Image: http://puu.sh/6apZJ.png
 2014-01-05 08:34:24 -06:00
Cheridan
261615a0bc Ninja Death Tweak 
THE CODE NO LONGER CHECKS IF THE MOB IS A NINJA EVERY TIME SOMEONE DIES

NINJAS GET EXPLOSIVE IMPLANTS TO DUPLICATE THE OLD FUNCTIONALITY

YES I'M MAD
 2014-01-04 19:26:05 -06:00
Miauw
61ed6a5e15 Merge branch 'master' of https://github.com/tgstation/-tg-station into kittens 
Conflicts:
	code/modules/mob/living/simple_animal/simple_animal.dm
 2014-01-03 19:27:51 +01:00
Cheridan
3a11af405c Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/2192 
Conflicts:
	code/modules/clothing/head/misc.dm
 2014-01-02 10:00:58 -06:00
Cheridan
8006b75307 Merge pull request #2182 from Rockdtben/sayRefactor 
Refactored how say deals with masks. As well as derp speech.
 2014-01-01 14:46:04 -08:00
Cheridan
87e69e0515 Merge pull request #2206 from fleure/stabbystab 
Fixed stabbing head with thick suit on
 2014-01-01 14:28:29 -08:00
Giacom
4832398f88 Merge pull request #2181 from errorage/2013_12_29_dmg_overlay_thresholds 
Changes damage overlay threshold from 10+ to 35+
 2014-01-01 07:50:35 -08:00
fleure
4a01ed176c Fixed stabbing error message target check 2014-01-01 15:33:49 +00:00
fleure
61f2cf9292 Fixed stabbing head with thick suit on 2013-12-31 23:39:30 +00:00
Cheridan
bb9c09df46 Obsoletes flags = FPRINT | TABLEPASS* 
*TABLEPASS was already totally obsolete.
FPRINT was used, but it was on virtually everything anyway.

Removes those flags from every instance where they were used. Also assigned and removed other flags where it made sense.

If it is desired, I can revive the flag as NOFPRINT, which would retain the original functionality, though inverted. That way it would be be used only  where it was intentional (holodeck items could use this for example).
 2013-12-30 15:03:17 -06:00
Aranclanos
d5ddac3a00 Merge pull request #1934 from RobRichards1997/30/11/2013-Toxic-Converter-Cyberlimb-Fix 
Cyber limbs fixes [FIXES #1920] + [Fixes #2180] + [RUNTIME FIX]
 2013-12-30 10:23:54 -08:00
Aranclanos
a5571508d0 Merge pull request #2049 from Incoming5643/wands3 
Magic Mania: Sprites, Fixes, Balancing, and Mini-Features
 2013-12-29 11:47:59 -08:00
Incoming
47ba33c50c Removes a pair of well meaning but apparently poorly realized code fixes for edge cases. 2013-12-29 13:46:29 -05:00
Rockdtben
89faaaf999 Moved Speech Modification via masks to masks. say and whisper now call the speechModification(message) proc in wear_mask. 
Moved derpspeech modification to mob_helpers.dm
 2013-12-29 12:12:41 -06:00
Robson Richards
d3d4c79946 Merges Heal_Damage and Heal_robotic_damage procs 
like I should have done in the first place.
Corrects all usages of Heal_damage so it works with the changed version.
Same goes for Heal_robotic_damage
 2013-12-29 17:40:12 +00:00
errorage
5153fa4cef Changes damage overlay threshold from 10 and on to 35 and on 
- Changes the damage overlay thresholds so they start displaying when you are a bit more damaged than currently. There are six damage overlays, their thresholds used to be 10-25; 25-40; 40-55; 55-70; 70-85; 85-infinity. This change sets them to 35-45; 45-55; 55-65; 65-75; 75-85; 85-infinity. (The thresholds are the sum of fireloss, bruteloss and the hit indicator variable)
- Oxyloss overlay left unchanged, since you pass out at 50 or something, so you need the visual cue quicker.

Main reason for this proposed change is that I feel the overlays kick in too quickly. I think it'd be good to leave a little room, so you don't get an overlay as soon as the first moron boops you over the head with his crowbar.
 2013-12-29 18:13:32 +01:00
Giacom
46a6830dec Merge pull request #2148 from ACCount12/master 
Space Retrovirus fix
 2013-12-29 02:57:39 -08:00
Miauw
f1376608eb Added kittens and Proc, sprites by Nienhaus. 2013-12-27 15:44:40 +01:00
Incoming
392c6d51a9 Merge branch 'master' of https://github.com/tgstation/-tg-station into wands3 2013-12-27 02:33:47 -05:00
Cheridan
7c2fbba76f Merge pull request #2111 from Perakp/voiceChangerFix 
Voicechanger fix
 2013-12-26 22:06:38 -08:00
Incoming
26a1bb65f2 Merge branch 'master' of https://github.com/tgstation/-tg-station into wands3 
Conflicts:
	code/modules/mob/death.dm
	code/modules/mob/living/carbon/alien/death.dm
	code/modules/mob/living/carbon/brain/death.dm
	code/modules/mob/living/carbon/human/death.dm
	code/modules/mob/living/carbon/monkey/death.dm
	code/modules/mob/living/silicon/death.dm
	code/modules/mob/living/silicon/robot/death.dm
 2013-12-27 00:55:44 -05:00