cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-26 00:51:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,162 Commits 61 Branches 14 Tags
3a11af405c8d3ff87e7c15fa80705dd53bb83fc0
Commit Graph

7344 Commits

Author SHA1 Message Date
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
248e6e94d7 Merge pull request #2170 from Rockdtben/throwAtRefactor 
Refactored throw_at
 2014-01-02 07:21:03 -08: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
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
6c644f4652 Merge pull request #2185 from Cluwnes/itspersonnell 
Those personnell were successfull.
 2014-01-01 14:36:09 -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
Cheridan
b659a2b829 Merge pull request #2203 from Perakp/jauntFix 
Fixes Ethereal Jaunt
 2014-01-01 13:54:34 -08:00
Cheridan
5f3bfa028b Merge pull request #2191 from Incoming5643/SMconfusion 
Changes the initialism for stat collecting on summon magic to SU
 2014-01-01 13:42:12 -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
fleure
be0f52b623 Fixed bruisepacks not working 2013-12-31 17:06:34 +00:00
Perakp
a7ead625be Fixes Ethereal Jaunt 
notransformation protection was stopping movement calls to the holder object.
Refractored code so wraith phase shift isn't copypaste just to change animations.
 2013-12-31 17:28:50 +02: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
Aranclanos
0184a61ef9 Syringe guns will now work on aliens properly 2013-12-30 19:44:58 -03:00
Cheridan
d1c3251931 Merge pull request #2183 from fleure/arcade 
Building arcade machines now works
 2013-12-30 13:26:58 -08: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
15d055a602 Merge pull request #2031 from Alek2ander/master 
VV permissions check update, fixes #2009
 2013-12-30 12:50:09 -08:00
Incoming
02a91e4c76 Changes the initialism for stat collecting on summon magic to SU because SM was taken by smoke. On the stat page this will result in smoke being overreported until a full month after this change has been live on both servers. 
For judgement purposes you can probably assume that nearly all "smoke" spells on the stat page are actually summon magic, because who the hell takes smoke?
 2013-12-30 14:26:37 -05: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
Cheridan
f1fb63d5e2 Merge pull request #2160 from Cluwnes/werequire1sample 
We require at least 1 sample of compatible DNA.
 2013-12-30 10:15:25 -08:00
Robson Richards
6397796058 Removes a Check by Aran's request 2013-12-30 17:31:39 +00: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
Cluwnes Honk
a348534ab1 Personnelly, I feel this pull request was successfull. 
Spelling fixes.
 2013-12-29 15:54:50 -08:00
Cluwnes Honk
6a03480976 More adjustments 
Raises the genome cap for absorb objectives by 1, making objectives range from 6-8 genomes. Also adds a message explaining your starting one genome.
 2013-12-29 15:37:40 -08:00
fleure
e7338e1b1a Building arcade machines now works 2013-12-29 22:46:24 +00: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
89006319dc Merge pull request #2179 from fleure/vending 
Toggling vending machine's voice now works
 2013-12-29 08:14:06 -08:00
Robson Richards
53bfd06609 Fixes #2180 - Augmented limb healing issues 2013-12-29 16:12:32 +00:00
fleure
0b299990e5 Also machines actually vend now! 2013-12-29 16:08:05 +00:00
Rockdtben
92636bbe01 Merge pull request #2168 from fleure/toolbox 
Fixed toolbox parent object giving error
 2013-12-29 08:00:11 -08: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
fleure
2f2fc92742 Toggling vending machine's voice now works 2013-12-29 13:50:35 +00:00
Giacom
047b7ee9ff Merge pull request #2158 from Cluwnes/ninjutsu 
Makes ninja gloves heat resistant.
 2013-12-29 02:58:49 -08:00
Giacom
71aa7d0857 Merge pull request #2157 from Cluwnes/pocketcards 
Makes cards pocketable.
 2013-12-29 02:58:28 -08:00
Giacom
46a6830dec Merge pull request #2148 from ACCount12/master 
Space Retrovirus fix
 2013-12-29 02:57:39 -08:00
Cluwnes Honk
b49604a485 Ups the genome requirement objectives by one to prevent ling ezwin with 5 genome objectives 2013-12-29 02:54:42 -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
08ec9df967 Fixes it for Nonhuman mobs. 2013-12-29 02:25:12 +00:00
Robson Richards
819bb9451d <3 Aranclanos, You always know what's best. 2013-12-29 00:52:13 +00: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
Aranclanos
f6aae4898e Merge pull request #2159 from Cluwnes/succes 
Succesful fixes
 2013-12-28 16:17:03 -08:00
Aranclanos
66fdd58424 Merge pull request #2161 from Cluwnes/gaslogging 
Adds ckey logging to canisters
 2013-12-28 16:10:52 -08:00