cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-21 14:34:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,472 Commits 61 Branches 14 Tags
8aaf10feb49f11b3f85766e60cce556bf94de23c
Commit Graph

4046 Commits

Author SHA1 Message Date
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
Razharas
80b592d0b3 Resolving conflicts 
God hates git
And so do i
 2014-01-03 21:12:14 +04:00
Giacom
537b6ddba0 Merge pull request #2214 from Aranclanos/IntiFetishNotInMyGame 
Removes the gag ball.
 2014-01-03 04:19:29 -08:00
Aranclanos
b5fc39236f changes strings to paths on the mining machinery code 2014-01-03 03:23:28 -03:00
sirbayer
efb480005d Syringe guns can suck it. 2014-01-02 16:18:48 -08:00
Giacom
b2e53335f0 Merge pull request #2167 from rymd/text-fix 
Fixed destructive analyzer failure messages
 2014-01-02 10:32:32 -08:00
Giacom
70a4d8e9af Merge pull request #2192 from Cheridan/iDidThisByHand 
Obsoletes flags = FPRINT | TABLEPASS*
 2014-01-02 10:31:46 -08:00
Giacom
c56cc9c89f Merge pull request #2122 from Miauw62/disposalsfix 
Disposals will no longer create invisible floor tiles.
 2014-01-02 10:30:12 -08:00
Cheridan
68362d7b49 fixing conflicts 
THANKS GIA

:I
 2014-01-02 10:04:22 -06: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
Giacom
542aca21f8 Merge pull request #2186 from Cluwnes/theunknownchicken 
Gives the chicken suit head some inv_flags
 2014-01-02 07:20:27 -08:00
Razharas
06d1969fef Fixed some issues 
No more suicider cloning
Added comments to the DNA and R&D wizardry
Added CLONE_INITIAL_DAMAGE define for the ammount of clone and brain
loss clones initially have in clonepod
Removed debug garbage
 2014-01-02 09:27:51 +04:00
Razharas
8d6536821e Merge branch 'master' of https://github.com/tgstation/-tg-station into MachinesOverhaulANdR&D 2014-01-02 09:02:01 +04:00
Aranclanos
1e3f2c37a6 Removes the gag ball. 2014-01-01 23:43:01 -03: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
Cheridan
004c3d7be6 Merge pull request #2198 from Incoming5643/wands3 
[Marble Madness] Improved Logging on the Bolt of Change
 2014-01-01 14:14:49 -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
Incoming
b33efbfa6b Improves logging on the bolt of change so admins can follow the paper trail of terrible mobs who get turned into other terrible mobs 2013-12-31 01:11:20 -05:00
sirbayer
f4542ee258 Scattershot ho! 2013-12-30 20:43:10 -08:00
sirbayer
d502cc86ea Merge branch 'master' of https://github.com/tgstation/-tg-station into srsbsns-deadlyboolets 
Conflicts:
	code/modules/projectiles/guns/magic/wand.dm
 2013-12-30 16:39:12 -08:00
sirbayer
a0a73d1ab5 Jesus Christ it compiles 2013-12-30 16:30:36 -08:00
Aranclanos
0184a61ef9 Syringe guns will now work on aliens properly 2013-12-30 19:44:58 -03: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
Rumia29
e52a838284 Sprite Changes on request from Nienhaus 2013-12-29 20:46:37 -05:00
Cluwnes Honk
df7fd3f98a Gives the chicken suit head some hiding flags 
The chicken suit helmet now has the same inv_flags as a xeno helm.
 2013-12-29 16:03:01 -08:00
Razharas
579be8953f Tweak of destructive analyzer and span classes 
Now instead of flat out refusing low reliability things it will be able
to take them inside and show the potential technology and reliability
level
It will also be able to deconstruct them, but if reliability is too low
it will show you that usual message but in the console window instead of
chat
Changed all the \red to span class in destructive analyzer's file
 2013-12-30 03:56:45 +04:00
Razharas
10ee52bbb6 Merge branch 'HopeThisFixsIt' into MachinesOverhaulANdR&D 2013-12-30 03:05:40 +04:00
Rockdtben
c8bdf9420c Put this in the right place 2013-12-29 16:09:35 -06: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
Rockdtben
87c4937558 Merge pull request #2169 from fleure/paper 
Fixes paper with no input looking populated
 2013-12-29 07:58:59 -08:00
Giacom
047b7ee9ff Merge pull request #2158 from Cluwnes/ninjutsu 
Makes ninja gloves heat resistant.
 2013-12-29 02:58:49 -08:00
Giacom
46a6830dec Merge pull request #2148 from ACCount12/master 
Space Retrovirus fix
 2013-12-29 02:57:39 -08:00
Incoming
093d9b386d Merge branch 'master' of https://github.com/tgstation/-tg-station into wands3 2013-12-29 02:20:09 -05:00
Aranclanos
e06e9ffa4c Merge pull request #2047 from Miauw62/condimentpacks 
Condiment packs: The Condipacking
 2013-12-28 21:16:43 -08:00
Robson Richards
889b9c66f3 Merge branch 'master' of https://github.com/tgstation/-tg-station into Toxic_converter_Fix 2013-12-29 00:40:24 +00:00
fleure
b07bca861f Fixes paper with no input looking populated 2013-12-28 16:30:50 +00:00
rymd
dc92b7d1cb Fixed destructive analyzer failure messages. 2013-12-28 14:13:30 +00:00
Cheridan
22060e18d4 Merge pull request #2133 from Giacom/labor_tweaks 
Labor Camp Tweaks #2
 2013-12-27 22:15:51 -08:00
Cluwnes Honk
dec6e4cd89 Makes ninja gloves heat resistant. 
Ninjas will no longer burn their hands on mere lights.
 2013-12-27 15:45:27 -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