cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-25 00:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,516 Commits 61 Branches 14 Tags
1bfd3eae34400a852da0ffc606b63c0895db5b71
Commit Graph

24397 Commits

Author SHA1 Message Date
KorPhaeron
1bfd3eae34 Better inhands 2016-02-22 16:36:47 -06:00
KorPhaeron
20e9b2a8e2 Fixes control wand access 2016-02-22 16:32:38 -06:00
KorPhaeron
d217b48ab3 Config does not work for spawning things in lockers 2016-02-22 15:42:07 -06:00
KorPhaeron
b278741b19 Door remote config 2016-02-22 14:58:05 -06:00
KorPhaeron
537ac55162 Removes excess whitespace 2016-02-18 02:37:48 -06:00
KorPhaeron
d6e6874206 Control Wand 2016-02-18 02:34:20 -06:00
Cheridan
cfcecba389 Merge pull request #15575 from phil235/ReviveFix1 
Fixes mob revival
 2016-02-17 20:42:10 -06:00
Cheridan
a2ef1ad26f Merge pull request #15545 from Shadowlight213/defenderpref 
Makes wizard academy defender respect prefs
 2016-02-17 19:57:02 -06:00
Cheridan
6290022001 Merge pull request #15547 from KorPhaeron/seed_vault 
Five lavaland ruins
 2016-02-17 19:54:08 -06:00
Cheridan
a66e40eb9a Merge pull request #15558 from Incoming5643/pisssh 
Restores the old sound of windowed doors
 2016-02-17 19:50:29 -06:00
Cheridan
bb00bd311f Merge pull request #15513 from KorPhaeron/chaplain3 
Four more holy weapons
 2016-02-17 19:48:06 -06:00
tkdrg
2934e6c8b7 Merge pull request #15165 from xxalpha/urange 
ultra range again
 2016-02-17 21:32:38 -03:00
tkdrg
2b96cbbdce Merge pull request #15574 from KazeEspada/Bagfixes 
Bag tweaks.
 2016-02-17 21:29:05 -03:00
tkdrg
0b888afc41 Merge pull request #15572 from KorPhaeron/gland 
Adds missing punctuation to alien mindshock
 2016-02-17 21:22:58 -03:00
tkdrg
5f2b0eae79 Merge pull request #15577 from phil235/NukeCinematicLayerFix 
Fixes inventory things appearing above the nuke cinematic.
 2016-02-17 20:49:12 -03:00
duncathan salt
b8946d608e Merge pull request #15480 from bgobandit/kitty 
Cats now display a variety of catlike behaviors!
 2016-02-17 17:07:05 -06:00
AnturK
3c8652e346 Merge pull request #15504 from phil235/HatMaskFacialHairFixes 
Fixes mask and head gear issues
 2016-02-17 21:47:17 +01:00
phil235
54b87e0239 Fixes typo in suit.dmi 
Removes action button from the paranormal response unit helmet
 2016-02-17 21:32:46 +01:00
Cheridan
9c4d90c72c Merge pull request #15564 from Incoming5643/ape_escape 
Pun Pun has gained a few persistence save file features
 2016-02-17 12:42:37 -06:00
xxalpha
7c0c66dba3 Merge remote-tracking branch 'upstream/master' into urange 2016-02-17 14:21:29 +00:00
KorPhaeron
f3fd49349c Prisoner Transport 2016-02-17 06:32:32 -06:00
AnturK
ea2f57e6d2 Merge pull request #15523 from optimumtact/extreme_makeover_turret_edition 
Rearrange turret files to split out functionality
 2016-02-17 11:34:02 +01:00
phil235
95f825e7ed Fixes inventory things appearing above the nuke cinematic. 2016-02-17 01:49:03 +01:00
phil235
2dd476f13e Fixes shaking someone resting not making them stand up. 
Fixes shaking someone not reducing the sleeping var if the mob asleep is buckled to stand up.
Fixes merge conflict issues.
Fixes my revive code leaving the revived AI blind.
 2016-02-17 01:23:36 +01:00
phil235
5db3ab47c7 Merge branch 'master' of https://github.com/tgstation/-tg-station into ReviveFix1 
Conflicts:
	code/game/machinery/computer/aifixer.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/mob/living/silicon/robot/robot.dm
 2016-02-17 00:33:26 +01:00
phil235
7e1efca13a Created two new procs to handle reviving mobs more easily: 
- can_be_revived(), used so we don't revive a mob who would immediately die again (lack of brain organ for carbons).
- fully_heal(), called by revive when we want to completely heal a mob before trying to ressuscitate it.

I gave some arguments to revive() so the proc can be used by more than just the admin healing code (ai revived by the AI fixer console, drone revived by another drone clicking it, strange reagent ressuscitating you, borg revived by restart circuitboard, changeling using his revive ability, etc)

This fixes borg revival not updating its vision correctly and not updating the diagnostic HUD. Same fix for changeling revival.
 2016-02-16 23:27:08 +01:00
Cheridan
c1a1e90ca7 Merge pull request #15536 from optimumtact/spidersspiderseverywhere 
Don't allow every single spider to be player controllable
 2016-02-16 15:47:15 -06:00
KazeEspada
5d8d5854f9 Bag tweaks. 
Department Backpacks are now the default(instead of grey backpacks).

Fixed an error on humans where new humans would have an integer for their backpack.

This will not affect current preferences.
 2016-02-16 14:03:35 -07:00
Cheridan
aa8de1bb51 Merge pull request #15554 from Menshin/autolathe_stacks_fix 
Fix autolathe merging on top stacks without checking for types
 2016-02-16 13:22:23 -06:00
KorPhaeron
8f776c2cd8 Missing punctuation 2016-02-16 11:34:51 -06:00
Cheridan
073817b0ba Merge pull request #15538 from phil235/SpawnAtomFix 
Fixes spawn_atom() runtime.
 2016-02-16 03:51:12 -06:00
Incoming
f61707c6f9 Pun Pun has gained a few persistence save file features 
Whatever Pun Pun is wearing on his/her head and face at round end will still be there at the start of the next round. Back and hands do not save for obvious balance reasons.
If Pun Pun dies but leaves an intact corpses his/her successor will be named Pun Pun II and inherit the items his corpse was wearing at the end of the round.
If Pun Pun gets gibbed the chain of monkeys is broken and the next round monkey will be a new progenitor with a potentially different name. Obviously their items won't be saved in this case.
 2016-02-15 21:20:29 -05:00
AnturK
7ede85391f Merge pull request #15527 from phil235/ReviveFixes 
Fixes blindness overlay after reviving.
 2016-02-15 23:17:55 +01:00
Incoming
9e2f72bd8c Makes the vanilla white windowed doors (the fulltile ones) sound like other doors again as opposed to sounding like windoors (the tile boarder ones). 
I'll take "Things everyone wanted to do but inexplicably didn't" for 400, Alex.
 2016-02-15 17:01:12 -05:00
oranges
f2d4a60c74 Fix a lot of issues as pointed out by review 
Update the defines to be the correct syntax
 2016-02-16 10:50:38 +13:00
oranges
913d46f32d Remove old workaround check 
This looks to be a check from before nodrop functionality to prevent robots using their gun on the turret
 2016-02-16 10:05:32 +13:00
oranges
0dd89d484a Rearrange turret files to split out functionality 
Add defines for the turret construction phases

Tweak syndicate turret targeting to remove uncessary faction check
 2016-02-16 10:05:32 +13:00
oranges
b496ca6043 Don't allow every single spider to be player controllable 2016-02-16 10:00:23 +13:00
KorPhaeron
d14a7f2470 Another map 2016-02-15 13:45:16 -06:00
tkdrg
10abc21c2c Merge pull request #15525 from AnturK/reliable_fix 
Basic reliability fix
 2016-02-15 16:44:58 -03:00
Menshin
8b5ffe4779 Fix autolathe merging stacks without checking for types. 2016-02-15 20:44:28 +01:00
tkdrg
2a4a5a42f4 Merge pull request #15522 from optimumtact/unholyspawns 
Refactor out a spawn in turret code
 2016-02-15 16:39:49 -03:00
tkdrg
80301881de Merge pull request #15515 from MrStonedOne/patch-154 
attempts to solve minimaps crashing the server. (again)
 2016-02-15 16:32:32 -03:00
KorPhaeron
9cec5f51a2 Merge pull request #15546 from octareenroon91/patch-31 
Correct generic chem patch icon
 2016-02-15 05:23:46 -06:00
oranges
f5812bbd47 Refactor out a spawn in turret code 
Also avoids checking the emagged var twice when shooting a projectile
 2016-02-15 23:25:02 +13:00
KorPhaeron
fbc55d391a Removes silly references 2016-02-15 04:14:27 -06:00
KorPhaeron
0e6a7b77c8 Seed Vault 2016-02-15 04:06:40 -06:00
octareenroon91
e51d602ca6 Correct generic chem patch icon 
Fixes #15540
 2016-02-15 01:15:37 -06:00
Shadowlight213
b46b11d75d Makes wizard academy defender respect prefs 2016-02-14 23:03:22 -08:00
Remie Richards
e8426a26da Merge pull request #15505 from ChangelingRain/sleeplesscarp 
Sleeping carp gang no longer has special equipment
 2016-02-15 03:05:04 +00:00