cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-15 19:46:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,741 Commits 61 Branches 14 Tags
501ecb1d2a5d8b215e69e1b413eefebe3104fad9
Commit Graph

6815 Commits

Author SHA1 Message Date
Swag McYolosteinen
501ecb1d2a Merge pull request #5945 from JJRcop/get_ghost-fix 
Fixes unreported issue with get_ghost
 2014-12-03 17:45:07 +01:00
Remie Richards
16506dabc9 Merge pull request #6162 from tkdrg/simplepush 
mob/Bump() refactor
 2014-12-03 16:43:58 +00:00
Swag McYolosteinen
9618c11a60 Merge pull request #5480 from Perakp/wormholeProjector 
Bluespace wormhole projector
 2014-12-03 17:42:49 +01:00
Remie Richards
af54024222 Merge pull request #6120 from Menshin/maploader_multiple_tiles_underlaying 
[MAPLOADER] Add support for the DMM multiple tiles on one turf underlaying
 2014-12-03 16:42:21 +00:00
Remie Richards
8eced8d302 Merge pull request #6134 from Menshin/null_loc_mobs_fix 
Prevent some mobs from spawning in nullspace
 2014-12-03 16:39:30 +00:00
Cheridan
4a4b1c1266 Merge pull request #6169 from phil235/DeathNettleBlendFix 
Two fixes for grinder
 2014-12-02 22:34:52 -06:00
hornygranny
3388c53838 Merge pull request #6110 from tkdrg/aiaiai 
Fixes exploit that lets AIs use machinery even after cameras are disabled
 2014-12-02 18:40:28 -08:00
phil235
47762bf960 Fixes being able to click the grinder buttons while it's operating (ejecting beaker before grinding is finished), the grinder window is now correctly updated. 
Fixes death nettle not producing pacid upon grinding, fixes novaflower not producing condensedcapsaicin (one of its reagents) upon grinding.
Renaming "inuse" var to "operating" to avoid confusion with "in_use" var
 2014-12-01 16:57:07 +01:00
Razharas
b9b73531a6 Merge pull request #6104 from tkdrg/bouncy 
Stops the field from bouncing the sing around
 2014-12-01 18:14:12 +03:00
tkdrg
74d73b29aa mob/Bump() refactor. OOPing and general cleanup. 
Removes copy-paste. Creates three new mob/living procs.
ObjBump, MobBump and PushAM which are called by mob/living/Bump().
Removes a ton of copy-paste and needless code.
Also fixes simple_animal Bump() on harm intent.
Previously, they'd move twice.
Fixes #3550
 2014-11-30 22:51:17 -03:00
Razharas
c8817469fc Merge pull request #6124 from MrPerson/eye_lmao 
Redo cyborg icon updating
 2014-11-30 22:46:37 +03:00
Menshin
8552a606f9 Minor optimization 2014-11-30 03:11:55 +01:00
Perakp
48b1ee513e Merge remote-tracking branch 'upstream/master' into wormholeProjector 
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
 2014-11-29 09:37:40 +02:00
hornygranny
33e07e2291 Merge pull request #6113 from tkdrg/ass 
Fixes assistant jobban bug
 2014-11-28 16:35:12 -08:00
Menshin
76ecd457b1 Killer tomatoes : 
* Prevent killer tomato from spawning inside nullspace
* It's now impossible to eat an awakening killer tomato
* Fixed been able to spawn lots of killer tomatoes by spam clicking the tomato object

Drones :

Prevent an edge case which would lead to a client spawning as drone in null space

Brains :

Makes brainmobs qdel instead of piling up inside the brain object
 2014-11-28 23:24:12 +01:00
MrPerson
89030ad3f7 Redo cyborg icon updating 
Removed the stupid "updateicon()" proc and placed the behavior in update_icons() and regenerate_icons()
Removed redundant update_fire() calls
Fixes #6057 since the staff calls regenerate_icons()
 2014-11-27 23:04:35 -08:00
Menshin
d0d82aa187 Add support for the DMM multiple tiles on one turf underlaying 2014-11-28 00:03:54 +01:00
Intigracy
8a1baad03b forgot the var / proc 2014-11-27 14:50:21 -08:00
hornygranny
b573a00f5e Merge pull request #5918 from Razharas/Cfour 
Who am i kidding, its explosions rework for a long time already
 2014-11-27 13:58:56 -08:00
hornygranny
bc7a7a7452 Merge pull request #6084 from tkdrg/hudindahood 
Fixes data/antag HUD bugs
 2014-11-27 13:50:34 -08:00
hornygranny
dff524910a Merge pull request #6088 from RemieRichards/SomeAcidBuffs 
Couple more changes to reagent sprayers.
 2014-11-27 13:49:25 -08:00
Razharas
d2848e5f95 Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour 2014-11-28 00:32:30 +03:00
tkdrg
4da919ce75 Fixes assistant jobban bug 
Assistant-banned people who had assistant set to 'Yes' were unable to
pick their job preferences.
 2014-11-27 16:51:15 -03:00
tkdrg
2e0a2b80bd Fixes AI canUseTopic() without camera exploit 
Fixes runtime in ai/Life()
 2014-11-27 15:43:22 -03:00
tkdrg
7153becc62 Fixes implants not updating the implant secHUD 
Makes med huds /carbon because of monkeys
Makes HUDs update after implant removal surgery
Fixes cloning not recovering antag huds
 2014-11-27 12:56:17 -03:00
Razharas
275d7fdd77 Merge pull request #6038 from paprka/hatfix 
fixes head of security and warden hat flashbang confusion
 2014-11-27 17:14:51 +03:00
tkdrg
65fb61be69 Stops the field from bouncing the sing around 2014-11-27 10:33:24 -03:00
Razharas
c5209f2399 Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour 2014-11-27 15:30:37 +03:00
Razharas
41a43b0040 Quickfix 2014-11-27 15:30:24 +03:00
Razharas
4998b19ddf Merge pull request #5679 from Aranclanos/projectilesBump 
Projectiles bump fix, spawn() removal
 2014-11-27 03:38:05 +03:00
Remie Richards
e1b77438e0 Allows emagged med borg sprayer to hold acid (as it does normally, this fix just lets them refil it with more acid if they please) 
Let's the Chemsprayer spray acids.
 2014-11-26 21:10:19 +00:00
hornygranny
7cec307bf4 Merge pull request #5917 from RemieRichards/FixAcidBalance 
Nerfs acid and cleans up /spray afterattack
 2014-11-26 11:12:11 -08:00
hornygranny
88896cea50 Merge pull request #5948 from tkdrg/monkeytrouble 
Makes condensed capsaicin work on monkeys
 2014-11-26 11:02:30 -08:00
Remie Richards
5343f2d1fa Merge branch 'master' of https://github.com/tgstation/-tg-station into FixAcidBalance 
Conflicts:
	code/modules/mob/living/living_defense.dm
 2014-11-26 19:01:17 +00:00
hornygranny
b24c51a992 Merge pull request #6065 from Razharas/BorgChemFix 
Fix for omnious reagent transfer error in #1673
 2014-11-26 10:51:40 -08:00
hornygranny
c79ea305a0 Merge pull request #6056 from tkdrg/paintsl 
Fixes pAI NTRC
 2014-11-25 17:42:29 -08:00
hornygranny
21b8df82d5 Merge pull request #5908 from tkdrg/hud 
Makes data and antag huds passive and creates /datum/atom_hud
 2014-11-25 12:53:03 -08:00
hornygranny
0cf197ca95 Merge pull request #6050 from phil235/ReagentDispenserMsgFix 
Fix reagent dispenser's message when empty
 2014-11-25 12:41:12 -08:00
hornygranny
1032cca0b7 Merge pull request #6051 from phil235/BigCarpSpriteFix 
Fixing the megacarp sprite
 2014-11-25 12:39:54 -08:00
hornygranny
6786cd73f4 Merge pull request #6052 from phil235/GoldSlimeSpawnFix 
Mining drones no longer spawns with gold slime extract.
 2014-11-25 12:39:43 -08:00
Razharas
67c2ddb734 Fix for omnious reagent transfer error 2014-11-25 15:29:59 +03:00
hornygranny
4702f16ecb Merge pull request #6037 from tkdrg/imdumb 
Fixes hydroponics harvesting in diagonals
 2014-11-24 21:05:17 -08:00
tkdrg
2090a93783 Fixes pAI NTSL 2014-11-24 21:31:26 -03:00
hornygranny
a24eeb7f93 Merge pull request #5758 from phil235/TorchFix 
Fixes the torch and flare icons.
 2014-11-24 15:18:08 -08:00
tkdrg
90b3fed5df Fixes hydroponics harvesting in diagonals 2014-11-24 20:14:57 -03:00
phil235
16ea9974d9 Fix the empty msg of reagent dispenser not making it clear that it cannot be refilled. 2014-11-24 19:49:34 +01:00
hornygranny
712008e848 Merge pull request #5970 from Xhuis/grammar_fix 
Fixes grammar errors in clothing items
 2014-11-24 10:44:32 -08:00
hornygranny
c51e95d31b Merge pull request #5988 from Razharas/TeleSci 
Fixes telesci runtime on memory setting
 2014-11-24 10:39:42 -08:00
hornygranny
2b1b6726e4 Merge pull request #5987 from Razharas/VirFix 
Fixes pandemic naming
 2014-11-24 10:39:30 -08:00
hornygranny
38f7947eb5 Merge pull request #5976 from wiox/willy 
Visor flags for sec gas mask
 2014-11-24 10:36:21 -08:00