cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-02-05 05:49:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,362 Commits 63 Branches 14 Tags
704c00aafea2690ed48747ddb8e4b602f268b4b2
Commit Graph

6250 Commits

Author SHA1 Message Date
Thunder12345
0ddd4e3c82 Cyka blyat 2016-02-13 20:11:58 +00:00
Thunder12345
e6da13511a Adds russian officer uniform 
Adds russian officer
Minor tweaks
 2016-02-13 20:11:58 +00:00
Thunder12345
b5c79e3781 Adds military russian 
Adds camouflage fatiges, functionally identical to turtlenecks
Adds buckshot loaded pump shotgun variant
Adds sprites for the new russian
 2016-02-13 20:05:51 +00:00
Thunder12345
3cc300e075 Changed ranged russian's gun to nagant revolver 
Makes mosin carrying russian a subtype instead of a 50% chance on a normal ranged russian
 2016-02-13 20:05:51 +00:00
tkdrg
e7af997785 Merge pull request #15441 from phil235/BrainChanges 
Brain fixes and changes
 2016-02-13 13:29:37 -03:00
duncathan salt
c8d4d58124 Merge pull request #15424 from Firecage/humansuit 
Makes the gibber give skins when gibbing humans. Also adds craftable human suits from human skin.
 2016-02-13 10:22:34 -06:00
Jordie
5e1ae24966 Merge pull request #15456 from neersighted/gotta_go_fast 
Ignore most slowdowns in space
 2016-02-13 17:36:06 +11:00
Jordie
12b804f3e7 Merge pull request #15455 from neersighted/derp 
Prevent monkies/animals from picking up intercoms
 2016-02-13 17:35:55 +11:00
Bjorn Neergaard
205809c25f Unanchor gibtonite, fix up some pull code 2016-02-13 00:26:28 -06:00
phil235
74e8bbf029 Fixes defibbed corpse not getting blind overlay despite being in crit. 
Brain mobs that are beaten to death can still be inserted inside a brainless human corpse but defibbing the corpse cannot work (the brain is too damaged). On the other hand cloning that corpse will still work.
Deffibing a brainless corpse no longer gives "further attempts may be successful".
Fixes brain mob's container var not being nullified on Destroy().
 2016-02-12 21:47:22 +01:00
Firecage
69569c4f81 merge conflict fix 2016-02-12 21:20:19 +02:00
Bjorn Neergaard
e041ced3d1 Fix jetpack runtime 2016-02-12 00:25:25 -06:00
Bjorn Neergaard
8bad6c72b9 Ignore most slowdowns in space 
Which applied even when using a jetpack, nerfing their
speed outside of turbo mode

@KorPhaeron need your input, not sure about the logic
of this because it was so tangled when I first
refactored this file...
 2016-02-12 00:12:51 -06:00
phil235
7416962f2a woops, brain still need to die when beaten. 2016-02-12 02:32:36 +01:00
phil235
a0855f2693 Brains can no longer be blinded, even when inside a MMI. 
Fixes borg made from staff of change not having a brain organ in their MMI.
Removes some duplicated procs in mob.dm (probably due to incorrectly fix merge conflicts)
You can now attack brains with a weapon even when not inside a MMI (previously only when in MMI).
Fixes brain vision not being given mech sight when put inside a mech.
Removing a brain from its MMI not place the brain in your hand instead of on the ground.
Fixes built cyborgs containing two mmis.
Damaged brain from attack can't be placed inside a cyborg.
Robotized humans (called Robotize()) , such as roundstart cyborgs, now have an MMI with the human's name (instead of having a brain with a borg name, which was inconsistent with built cyborgs).
Syndiborgs bought by nukeops now have a brain with the same last name as the ops team.
Fixes Borg created with staff of change not containing a brain organ.
Fixes brain being killable when inside cyborgs. Fixes borg dropping a dead mmi brain unable to talk. Brains are now immune to environment damage and radiation.
Fixes brain being able to suicide multiple times (if put in and out of an MMI)
 2016-02-12 02:04:14 +01:00
Ultimate Chimera
115aefebe3 Makes it so xenos make a hissing sound with the *hiss emote. 2016-02-11 17:48:37 -07:00
AnturK
7d30ceb425 Merge pull request #15404 from phil235/AlienWeakenedFix 
Fixes alien's weakened var never decreasing.
 2016-02-11 23:27:24 +01:00
Firecage
c4c37d6553 Makes the gibber give skins when gibbing humans. Also adds craftable human suits from human skin. 2016-02-11 09:59:23 +02:00
Cheridan
c782baa86c Merge pull request #15125 from bgobandit/clownmemes 
Poking a clown mob produces the proper response.
 2016-02-11 01:52:04 -06:00
duncathan salt
c04acddef9 Merge pull request #15381 from neersighted/runtime_meet_proc 
Fix a number of runtimes
 2016-02-10 23:50:38 -06:00
duncathan salt
933baf5943 Merge pull request #15229 from Shadowlight213/Muteall 
Adds a preference to mute Centcom, alert level, and VOX sounds
 2016-02-10 21:34:30 -06:00
phil235
4376477c5b named argument for better readability. 2016-02-11 01:31:23 +01:00
Cheridan
eeb96cb7a5 Merge pull request #15360 from neersighted/ionsomething 
Remove borg jetpack, give them ion thrusters instead
 2016-02-10 18:19:13 -06:00
phil235
062fc929ba Fixes alien's weakened var never decreasing. 2016-02-10 22:52:36 +01:00
phil235
0291f450d2 Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdatesChanges 
Conflicts:
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/death.dm
	code/modules/mob/living/login.dm
	code/modules/mob/mob.dm
 2016-02-10 22:35:19 +01:00
tkdrg
2609e8bf04 Merge pull request #15344 from Shadowlight213/Mulesky 
Restores client controlled mulebots running people over. Greatly nerfs mulebot health to compensate.
 2016-02-10 16:42:06 -03:00
Shadowlight213
91c73e9663 Re-adds mulebot running over for sentient mulebots. Greatly nerfs mulebot health. 2016-02-10 09:33:21 -08:00
tkdrg
22d90b6d04 Merge pull request #15350 from Shadowlight213/radioMMI 
Removes Radio MMI sybtype and adds a toggleable  radio to normal MMIs.
 2016-02-10 12:53:35 -03:00
AnturK
559ab8fa6f Merge pull request #15354 from neersighted/call_me_cratezy 
Allow horizontal mobs to fit into crates
 2016-02-10 16:17:19 +01:00
Bjorn Neergaard
e4f3045487 Add spacecat 
Fixes a revert in my last crate PR, spacecat added to asteroid
secret room (previously included a cat critter crate)
 2016-02-10 09:15:03 -06:00
Shadowlight213
ec6fcc057d Removes Radio mmi subtype and adds radio to regular MMI 2016-02-10 00:32:41 -08:00
Bjorn Neergaard
f4c33332fe istypeless meme 2016-02-09 23:23:39 -06:00
Bjorn Neergaard
33e73640fa Fix synth runtime 
Synth damage overlays only apply if disguised

The following runtime has occured 80 time(s).
runtime error: Cannot read null.appearance
proc name: handle disguise (/datum/species/synth/proc/handle_disguise)
  source file: species_types.dm,649
  usr: null
  src: Military Synth (/datum/species/synth/military)
 2016-02-09 23:00:03 -06:00
Bjorn Neergaard
76975aa27e Fix IsAdminGhost runtime 
The following runtime has occured 263 time(s).
runtime error: Cannot read null.client
proc name: IsAdminGhost (/proc/IsAdminGhost)
  source file: mob_helpers.dm,398
  usr: Nanotrasen Private Security Of... (/mob/living/simple_animal/hostile/nanotrasen/ranged/smg)
  src: null
 2016-02-09 22:46:59 -06:00
tkdrg
892fc67e67 Merge pull request #15335 from ChangelingRain/dronechatter 
Fixes doubled drone messages
 2016-02-10 01:33:03 -03:00
Bjorn Neergaard
4b455f5ed3 Actual sprites 2016-02-09 17:36:18 -06:00
Bjorn Neergaard
173387eefc Remove borg jetpack, give them ion thrusters instead 
Also clean up jetpack human movement because wow that code was messy
Its still bad but its better (tm)
 2016-02-09 14:53:37 -06:00
Nerd Lord
a020ae37a4 Merge pull request #15328 from phil235/VisionFixes3 
Fixes radiation never going down when above 100.
 2016-02-09 12:04:16 -05:00
Shadowlight213
b1ffb4625e Gives round start cyborgs Radio enabled MMIs 2016-02-09 00:12:01 -08:00
Shadowlight213
cc89d3f954 Removes pai mulebot knockdown 2016-02-08 21:00:58 -08:00
tkdrg
5d8051ad4a Merge pull request #15314 from KorPhaeron/botfix 
Fixes bot factions (for real this time)
 2016-02-08 20:23:01 -03:00
Nerd Lord
fb46ce9231 SPEED NERDS ARE HOUNDING ME 2016-02-08 18:17:23 -05:00
Nerd Lord
20a22e9389 Fixes doubled drone messages. 2016-02-08 18:00:46 -05:00
tkdrg
e554077458 Merge pull request #15327 from phil235/VisionFixes2 
Some vision fixes
 2016-02-08 19:34:37 -03:00
Nerd Lord
d6b7ed4c06 Merge pull request #15277 from KorPhaeron/lusty_xeno 
Adds a missing \ to xenomaid attack message
 2016-02-08 17:27:06 -05:00
Cheridan
65d9d10ca6 Merge pull request #15276 from tkdrg/droneage 
Adds a minimum account age for drones
 2016-02-08 16:25:39 -06:00
phil235
8943315686 Fixes radiation never going down when above 100. 2016-02-08 20:03:05 +01:00
phil235
4562f423ce Fixes small errors 2016-02-08 19:55:10 +01:00
phil235
16a5441379 Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionFixes2 
Conflicts:
	code/game/objects/structures/crates_lockers/closets.dm
 2016-02-08 19:35:01 +01:00
phil235
b9bba3a501 Fixes unconscious mob standing still when removed from cryo cell, closet, containers. 
Fixes mobs inside cryo cells getting pipes overlay(ventcrawl). Ventcrawler can no longer move in or out of
the cryo cell, which fixes ventcrawler going into cryo cell and getting stuck in it.
Being inside a cryo cell now give you a nearsight overlay (same as closet).
Brains no longer get the red circles overlay when damaged.
MMI now properly updates its icon when the brain mob dies.
Fixes getting stuck with a grab inside you when grabbing someone buckled.
Silicon stunned, weakened and paralysis is now properly updated.
 2016-02-08 19:22:45 +01:00