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

6857 Commits

Author SHA1 Message Date
tkdrg
e2c15d5210 Merge branch 'master' of https://github.com/tgstation/-tg-station into hudwhyyoudothistome 
Conflicts:
	code/modules/hydroponics/hydroponics.dm
 2014-12-08 13:48:22 -03:00
Swag McYolosteinen
b828448645 Merge pull request #6228 from paprka/coatscoats 
Adds winter coats and changes labcoat toggling
 2014-12-08 11:35:56 +01:00
Swag McYolosteinen
bff2e62a0f Merge pull request #6175 from Razharas/ExActFix 
Fixes ex_act() destroying too much shit
 2014-12-08 08:03:35 +01:00
paprka
c158599253 Christmas santa hats! 2014-12-07 20:02:03 -08:00
Razharas
5a78aa83be Merge pull request #6225 from NecroticBinder/Clean_Slime_Fix 
Clean slime fix
 2014-12-08 04:31:58 +03:00
Swag McYolosteinen
609807df75 Merge pull request #6199 from Ergovisavi/less_terrible_human_plants 
Pod Cloning changes
 2014-12-07 17:34:54 +01:00
Ergovisavi
e581a3ff8f Commiting changelog for new replica pod behavior 2014-12-07 05:13:54 -08:00
Remie Richards
b4c5b7348d Merge pull request #6222 from phil235/SaltShakerFix 
Fixes saltshaker icon when adding salt to a condiment bottle.
 2014-12-06 23:57:29 +00:00
tkdrg
3e97e935af /datum/atom_hud (Passive HUDs) bugfixes 
Moves antag_hud image and datum to mind instead of mob.

Fixes mobs keeping data HUDs after transfer_to().
Fixes gibbed bodies losing their antag HUDs.
Fixes the data hud disappearing when dropping unrelated HUDs.

Fixes #6206
Fixes #6209
 2014-12-06 15:05:23 -03:00
Swag McYolosteinen
6f5b2cf7ea Merge pull request #6224 from fleure/gargleblaster 
Changes Gargle Blaster description
 2014-12-06 10:28:23 +01:00
paprka
953bffd23b compile error fix 2014-12-05 21:27:52 -08:00
paprka
0f3f0659d1 coats to lockers, winter boots 2014-12-05 21:14:49 -08:00
Razharas
6fb548b283 Merge pull request #6220 from MrPerson/yet_another_attempt_at_fixing_this_shit 
Fixes mobs getting moved on the escape pods when buckled
 2014-12-06 07:42:12 +03:00
Cheridan
d124415c85 Merge pull request #6212 from GunHog/DS_Ninja_Biosuit_Anti-acid 
Acid immunity for Biosuits, Ninja, and DeathSquad, and fire protection for DeathSquad
 2014-12-05 14:45:53 -06:00
Razharas
7758a0afed Ok now explosions shall work properly 
Changed severity to target, make items not destroy themselves on
severity lower than 1, all that stuff
 2014-12-05 23:21:48 +03:00
Razharas
6ce052f45a Merge branch 'master' of https://github.com/tgstation/-tg-station into ExActFix 2014-12-05 20:45:27 +03:00
paprka
9e9b8b440d adds winter coats and changes labcoat toggling 2014-12-04 21:29:21 -08:00
NecroticBinder
aff046443a Update say.dm 2014-12-04 15:30:20 -06:00
Cheridan
f909d59d1a Merge pull request #6130 from phil235/AttackMsgStandardizedFormat 
Standardizing attack messages to always show the attacker first
 2014-12-04 12:45:31 -06:00
fleure
571e3a4487 Changes Gargle Blaster description 2014-12-04 18:03:50 +00:00
phil235
e3c7018048 Fixes saltshaker icon when adding salt to a condiment bottle. 2014-12-04 17:04:28 +01:00
Cheridan
90fc7f3740 Merge pull request #6026 from phil235/BluespaceCrystalVanishFix 
Adding sparks, sound and messages when a bluespace crystal is crushed or thrown
 2014-12-04 09:32:02 -06:00
MrPerson
47c46844f2 Another buckling fix 
Fixes #5730

The ride never ends
 2014-12-04 05:42:21 -08:00
GunHog
958e824f37 Acid protection for Biosuits, Ninja, and DeathSquad 
- Biosuits, Ninja armor, and Deathsquad armor are now immune to acid.
- Deathsquad armor is now also fireproof!
 2014-12-03 22:58:21 -06:00
Menshin
738bfe27a4 Not idea why if(_dmm_preloader) fails to catch nulls... 2014-12-03 20:03:47 +01:00
hornygranny
bc9d9f6d58 Merge pull request #6105 from RemieRichards/AcidProtectionUpdate 
Acid protection update
 2014-12-03 10:28:47 -08:00
hornygranny
23fd694320 Merge pull request #6127 from phil235/SpanFix1 
Fixes span classes and show_message()'s
 2014-12-03 10:28:06 -08:00
hornygranny
81061d3f62 Merge pull request #6182 from phil235/AdjustMaskFix 
Fixes adjustmask verb for sechailer
 2014-12-03 10:27:25 -08:00
phil235
dcb48e3168 Merge branch 'master' of https://github.com/tgstation/-tg-station into SpanFix1 
Conflicts:
	code/modules/mob/living/simple_animal/friendly/corgi.dm
 2014-12-03 18:59:32 +01:00
Swag McYolosteinen
879f67d834 Merge pull request #6142 from CorruptComputer/dropinacancel 
Adds a cancel button to the drop bomb verb
 2014-12-03 18:12:45 +01:00
Swag McYolosteinen
5863d2f5e8 Merge pull request #6075 from Jordie0608/spaceisalivewiththesoundofmidis 
Stop Sounds usable by any holder
 2014-12-03 17:49:51 +01:00
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
Ergovisavi
ff5b845371 Some changes to Blood and Replica Pods, adds more vars for allowing Replica pods to clone without an intact body, sets replica production to 1 for faster cloning, makes you a plantman/woman 100% of the time 2014-12-03 06:29:49 -08: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
515807ee67 Fixes adjustmask verb for sechailer letting you chose the user mob from a list of all mobs on screen. 2014-12-02 19:25:31 +01:00
Razharas
f4f3768d70 Fixes ex_act() destroying too much shit 
Borg modules are safe
So are items with bomb protection
Items in people who wear bomb-protective gear are safe too
 2014-12-02 18:30:56 +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
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
CorruptComputer
ae37dc1013 Allows 0 2014-11-29 14:55:57 -06:00
CorruptComputer
fe3e3e8ecc Adds a cancel button to the drop bomb verb 2014-11-29 12:39:57 -06: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