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

12698 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
Remie Richards
88ad308825 Merge pull request #6144 from Menshin/storage_calling_super 
Made obj/item/weapon/storage call ..() on New()
 2014-12-03 16:38:43 +00:00
Cheridan
4be3b065d9 Merge pull request #6122 from AndroidSFV/fix6097 
Fixes #6097
 2014-12-02 22:48:01 -06: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
hornygranny
c683849747 Merge pull request #6160 from xxalpha/somethingsomethingreturnnull 
Fixes a couple description related issues with fancy storage
 2014-12-02 13:13:53 -08:00
hornygranny
9c8f3efdcb Merge pull request #6158 from Razharas/Chems 
Proper fix for mechs
 2014-12-02 10:19:36 -08:00
Cheridan
e52db34ce3 Merge pull request #6132 from phil235/VirusFix2 
Fixes some incurable diseases
 2014-12-02 08:18:04 -06:00
Razharas
0b5ae9899e Merge pull request #6125 from MrPerson/span_classes_never_heard_of_them 
Removes a stray /red in robot_upgrades.dm
 2014-12-02 15:54:17 +03: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
Razharas
a08c7a0856 Merge pull request #6117 from Intigracy/you'renotverybright 
Sanitizes OOC color editing
 2014-12-01 17:51:31 +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
xxalpha
260ee75c9a Fixes several description related issues with fancy storage 2014-11-30 22:03:25 +00:00
Razharas
6eba69ab28 And this too 2014-12-01 00:24:49 +03:00
Razharas
14d0d166f3 Merge branch 'master' of https://github.com/tgstation/-tg-station into Chems 2014-12-01 00:13:13 +03:00
Razharas
c2046105af Ok reverting this shit 
Disregard this you know what i do
 2014-12-01 00:12:58 +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
efb50e374a Made obj/item/weapon/storage call ..() on New() 2014-11-30 03:14:49 +01: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
hornygranny
9ea01e3e44 Merge pull request #6107 from tkdrg/runtimesfuntimes 
Fixes pacid chem grenade runtime
 2014-11-28 16:35:01 -08:00
hornygranny
e7d862b248 Merge pull request #6119 from Intigracy/recursivebyebye 
Removes recursive explosions
 2014-11-28 16:33:30 -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
phil235
7d9c9bd5fc Fixing fake_gbs, gbs, magnitis and maybe other diseases not being curable. 2014-11-28 22:31:04 +01:00
Razharas
da35b4dadc Merge pull request #6115 from CorruptComputer/pdashitstorm 
Added a cancel button to the PDA
 2014-11-28 20:52:38 +03:00
Razharas
b3f79777c9 Merge pull request #6092 from optimumtact/patch-1 
Stop items having a negative throw force against grilles
 2014-11-28 15:16:59 +03:00
Razharas
9e0d8c6ef6 Merge pull request #6094 from tkdrg/cuffmsg 
Adds some feedback messages for handcuffing
 2014-11-28 15:13:36 +03:00
MrPerson
62e9f21382 Removes a stray \red in robot_upgrades.dm 2014-11-27 23:21:35 -08: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
AndroidSFV
453f04c7ee Fixes #6097 by adding a necessary argument 2014-11-27 21:41:00 -06: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
Intigracy
31835f1987 Removes the unused explosion_recursive.dm and everything related to it, including the configuration option. 2014-11-27 14:28:20 -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
67c7dae5fd Merge pull request #6089 from GunHog/TG_Dreamworks_How_To_Train_Your_Bot 
Bot movement fixes
 2014-11-27 13:53:23 -08:00
hornygranny
b42105770b Merge pull request #6081 from Razharas/CompFix 
Fix of comms console cooldown and computer rework
 2014-11-27 13:52:17 -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
Razharas
2971c2cf40 Makes walls not break shit under them 
SEE HOW EASY IT IS WITH THE NEW EXPLOSIONS?
YEAH THATS RIGHT NIGA THATS HOW WE DO IT IN THE PROPER CODING TOWN
BIATCH
 2014-11-28 00:32:08 +03:00
Intigracy
e9b5f83de2 Update ooc.dm 
shhhh
 2014-11-27 13:25:16 -08:00
Intigracy
aeb96a5f0f sanitizes OOC color editing 
consistency in colour vs color
 2014-11-27 13:09:09 -08:00
CorruptComputer
058e342e95 Added a cancel button to the PDA 2014-11-27 14:27:00 -06: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