cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-13 02:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,495 Commits 62 Branches 14 Tags
69fa21e66dcaa0d5dd2a0429c8e15bc15ea202ae
Commit Graph

4858 Commits

Author SHA1 Message Date
Cheridan
69fa21e66d Merge pull request #11472 from Aranclanos/larvatypo 
REMOVES ALIEN LARVAS
 2015-08-31 00:30:31 -05:00
Razharas
d1c417e996 Merge pull request #11416 from xxalpha/airlockQDEL 
Added qdel(wires) to a bunch of objects Destroy proc.
 2015-08-31 00:08:27 +03:00
Jordie
f26a67348d Merge pull request #11455 from Ergovisavi/gang_hires_a_cleaner 
Some swarmer issue fixes
 2015-08-30 17:51:57 +10:00
Aranclanos
537c823fa8 Removes an incorrect type path, mob/living/carbon/larva, unused. It was just a typo. 2015-08-29 22:48:20 -03:00
Cheridan
04869ad71d Merge pull request #11451 from Aranclanos/carbonreagents 
Fixes alien larva breathing.
 2015-08-29 20:02:29 -05:00
Cheridan
7a469e240a Merge pull request #11437 from bgobandit/dronepax 
Refactors medical stacks used on simple animals.
 2015-08-29 18:55:27 -05:00
Ergovisavi
49ce1d65db -Fixes #11448 
-Fixes #11443
Swarmer related issues
Also adds feedback to where unactivated swarmers spawn, and if someone took one before you
Fixes the automated announcement system not qdel()-ing properly
 2015-08-29 14:45:28 -07:00
hornygranny
2367ae48c9 Revert "Smooth out gliding so movement isn't (as) jerky" 2015-08-29 13:37:55 -07:00
Cheridan
a904c2a765 Merge pull request #11446 from AnturK/randomfixes 
Armor Fix, Restrained SNPC fix
 2015-08-29 13:13:49 -05:00
Swag McYolosteinen
137f0e0baf Merge pull request #11159 from MrPerson/smooth_gliding 
Smooth out gliding so movement isn't (as) jerky
 2015-08-29 17:56:40 +02:00
Aranclanos
3714bdf0d2 Fixes alien larva breathing. 
Moves the create_reagets() to carbon New() instead of each subtype calling it by themselves.
 2015-08-28 18:21:28 -03:00
AnturK
0e46800fd1 fixes snpc cuff pulling 2015-08-28 19:03:22 +02:00
bgobandit
607170a9ef g merge conflicts. remote-tracking branch 'upstream/master' into dronepax 
Conflicts:
	code/modules/mob/living/simple_animal/revenant/revenant.dm
	code/modules/mob/living/simple_animal/slaughter/slaughter.dm
 2015-08-28 02:54:43 -04:00
bgobandit
6f6744da33 Refactors healing simple animals with bruise packs. 2015-08-28 02:02:43 -04:00
Cheridan
d824f7b35f Merge pull request #11382 from Ergovisavi/bot_swarm 
Adds "Swarmers" - Simple mob side antagonist
 2015-08-28 00:21:23 -05:00
Ergovisavi
3737234b9c -Adds swarmer as a language, makes them only able to speak to each other 
-Fixes a few structures/machines taking non brute/burn damage from attack_animal
-Adjusts girders to be a little less resistant to explosions
-Span classes all the swarmer messages, bumps their health up to 40
-Adds ability for swarmers to dismantle machines and disable cameras. Some are obviously protected.
 2015-08-27 22:10:30 -07:00
xxalpha
19947d4fa0 Added qdel(wires) to a bunch of objects Destroy proc. 
Return ..()
 2015-08-27 11:10:58 +01:00
Aranclanos
9c9bf4a858 Merge pull request #11393 from Ergovisavi/has_wumbo_gone_too_far 
Fixes infinite wumbo-ing
 2015-08-27 01:06:03 -03:00
Cheridan
3278a3926b Merge pull request #11358 from phil235/XenoFeatures1 
Facehugger inhands, xeno tweaks, and monkey bugfixes
 2015-08-26 07:52:31 -05:00
Aranclanos
38e6a09cf9 Merge pull request #11351 from Core0verload/nodirt 
Removes dirt from walking on tiles
 2015-08-26 06:27:31 -03:00
Ergovisavi
6277a80cdb -Fixes infinite wumbo-ing 2015-08-25 14:02:48 -07:00
phil235
67a7eb2d5f Merge pull request #11277 from Jordie0608/beforecolortvalllistswereblackandwhite 
Changes gold slime core hostile mob list to var
 2015-08-25 20:03:13 +02:00
Ergovisavi
9572bd6aa6 -First revision of Swarmer mob, hud, icons, etc 
-Adds functionality of ignored damage types to simple mobs
-Adds functionality of melee damage types to simple mobs
 2015-08-25 03:24:34 -07:00
phil235
1f37141b8b Alien humanoids and monkeys can now use "me". 
Alien hivemind chat now uses <span class='alien'> (dark purple). Also the alien queen name now appears bigger in the hivemind chat.
 2015-08-24 22:53:45 +02:00
phil235
5cecd7e9fe Simplifies plasmavessel/on_life() a bit, and make xeno on weeds also heal clone damage. 2015-08-24 19:54:51 +02:00
phil235
cb1cd5b1e7 Monkey and aliens now all use carbon/examine(). 
Fixes monkeys being able to strip and uncuff people while handcuffed themselves.
Add an inhand sprite for facehuggers (taken from Xhuis) (but they don't appear for large queens, it'd look ugly).
Xenos now regenerate plasma on alien weed even when injured but at half the normal rate.
Moved queen/large/update_icons() to humanoid/update_icons.dm
 2015-08-24 17:07:09 +02:00
Cheridan
227f8cf058 Merge pull request #11335 from phil235/DelToQdelBugFixes 
Some bugfixes with qdel
 2015-08-24 08:36:42 -05:00
phil235
eaf4f6b33e Merge pull request #11321 from Jordie0608/comebacktousrevenant 
Stops mindless revenants from despawning
 2015-08-24 13:39:45 +02:00
phil235
5c23677b77 Merge pull request #11316 from KorPhaeron/escapingfood 
Slaughter Demon Fix
 2015-08-24 13:33:30 +02:00
c0
9cfb246e4f Removes dirt from walking on tiles 2015-08-24 11:33:52 +03:00
Cheridan
1cc34a8298 Merge pull request #11306 from Aranclanos/hatlessdog 
Fixes a runtime caused when interacting with a hat-less Ian
 2015-08-23 21:48:39 -05:00
Cheridan
f37e9873d1 Merge pull request #11307 from MrStonedOne/patch-31 
Fixes spawn revenant triggering WAY too often.
 2015-08-23 20:27:30 -05:00
Cheridan
99f73bc856 Merge pull request #11248 from RemieRichards/electrocution_animation 
Adds an animation to being electrocuted, like in cartoons!
 2015-08-23 18:22:00 -05:00
phil235
bf6b830fb0 Fixes action button not updating correctly sometimes (b/c the change from del to qdel means the button wasn't null after Removal which fucks with the action update procs) 
Fixes infinite loop when deleting a camera mob.(Destroy calls qdel which calls Destroy)
 2015-08-23 14:47:44 +02:00
Jordie0608
68a28e5ac2 stops mindless revenants from despawning 2015-08-22 18:58:10 +10:00
Jordie0608
8c26f4cb01 Merge branch 'master' of https://github.com/tgstation/-tg-station into beforecolortvalllistswereblackandwhite 
Conflicts:
	code/modules/mob/living/simple_animal/simple_animal.dm
 2015-08-22 16:55:13 +10:00
Jordie0608
5824fedc17 gold core spawnable as var 2015-08-22 16:49:13 +10:00
Remie Richards
1f1e539279 Merge pull request #11243 from Ergovisavi/puff_puff 
Adds "Wumborian Fugu" hostile mob
 2015-08-22 02:58:12 +01:00
KorPhaeron
73aac62ce6 Changed wording 2015-08-21 18:14:33 -05:00
KorPhaeron
43a151ae4e Fix 2015-08-21 18:14:00 -05:00
Kyle Spier-Swenson
9f953a2816 Fixes spawn relevant triggering WAY too often. 
20, as an event weighting, happens twice as often as rad storm, a 10 weighted event.

Its way too much. I put it to 7 weight, halfway between rad storm (10) and meteor storm (5)
 2015-08-20 23:45:13 -07:00
Aranclanos
db57f5834b Fixes a runtime caused when interacting with a hat-less Ian 2015-08-20 22:34:03 -03:00
Remie Richards
ca91b43f0a Merge pull request #11258 from Anonus/spoopyghosts 
Fixes a bunch of revenant stuff, again.
 2015-08-19 16:15:03 +01:00
Nerd Lord
a1b557ab02 Harvest ability is dead and gone, just click them, nerd. 2015-08-19 11:06:37 -04:00
Jordie0608
94344cd471 changes gold slime core hostile mob list to whitelist 2015-08-19 21:10:36 +10:00
Jordie
a5c274cbc7 Merge pull request #11262 from KorPhaeron/standproud 
Guardian Updates
 2015-08-19 19:53:13 +10:00
Swag McYolosteinen
825b5794c7 Merge pull request #11239 from Firecage/del2qdel 
del() to qdel()
 2015-08-19 11:50:24 +02:00
KorPhaeron
4fd1b7f20f Merge branch 'standproud' of https://github.com/KorPhaeron/kortg into standproud 2015-08-19 04:38:26 -05:00
KorPhaeron
bac3cc0b6d Changelog 2015-08-19 04:38:11 -05:00
MrPerson
51a17eeeac Per MSO's advice, Ceiling glide_size until BYOND supports floats 2015-08-18 21:54:53 -07:00