cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-14 19:03:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,419 Commits 62 Branches 14 Tags
d1eb8fcaecbafc6fbca61ea604877a59ab7d290e
Commit Graph

4028 Commits

Author SHA1 Message Date
Jordie
2d94da8e59 Merge pull request #8592 from phil235/AlienAttackBlob 
Fixes alien humanoids not being able to attack blobs.
 2015-03-31 19:11:12 +11:00
ACCount12
f10d0df8cf Merge remote-tracking branch 'origin/master' into mining 2015-03-31 18:31:12 +12:00
ACCount12
1c219f0ebe A lot of stuff 2015-03-31 18:30:09 +12:00
Cheridan
67d9f77ea9 Merge pull request #8600 from phil235/AlienNestFixing 
Fixes alien nest buckling
 2015-03-31 00:06:14 -05:00
phil235
e88e8a4ed5 Fixes drowsyness never going down. 2015-03-31 00:27:32 +02:00
Cheridan
74d2d67280 Merge pull request #8604 from Niknakflak/NakedCorgis 
Adds the ability to shave all types of corgis
 2015-03-30 08:26:01 -05:00
NikNakFlak
010fed04c6 Spelling 2015-03-29 15:30:58 -07:00
NikNakFlak
306adf7d95 Corgi fixes. 2015-03-29 13:21:56 -07:00
Cheridan
bf36e8d040 Merge pull request #8615 from sawu-tg/npcpool 
Updates the NPCPool to current branch.
 2015-03-29 15:10:15 -05:00
NikNakFlak
a4c870669d Code changes to corgi.dm and changelog 2015-03-29 12:44:42 -07:00
Sawu
ab776cf014 Updates the NPCPool to current branch. 
see #7012
* NPCPool will co-ordinate and organize all SNPCs, making them stronger and more intelligent.
* SNPCs can use the botPool system to co-ordinate and delegate with each other.
* SNPCs have been given factions to allow interoperability between certain types of SNPCs.
* Bots (machinery/bot) can use the system too for basic help and coordination.
 2015-03-30 02:50:21 +11:00
xxalpha
66c47c98e1 Added check for inbuilt jetpack in movement_delay proc. 2015-03-29 16:15:13 +01:00
xxalpha
937aea030f Merge remote-tracking branch 'upstream/master' into fasterspace 
Conflicts:
	code/modules/mob/living/carbon/human/species.dm
 2015-03-29 15:30:38 +01:00
Jordie
fdbef46277 Merge pull request #8543 from Szunti/mining-mobs-night-vision 
Night vision for mining mobs
 2015-03-30 01:22:53 +11:00
Jordie
f5cf0dd3e9 Merge pull request #8392 from xxalpha/hardjet 
Embedded Jetpacks
 2015-03-30 01:21:05 +11:00
Remie Richards
2dec0e8fa4 Fixes Hat removal code by reticking carbon/inventory and moving carbon inventory code back there. (Mystery coder who undid this, Curse you!) 2015-03-29 14:45:09 +01:00
NikNakFlak
89defc1d8b Adds the ability to shave all types of corgis, including ian, lisa, regular corgis, and corgi puppies. 2015-03-28 19:24:13 -07:00
phil235
2ef01a61c5 Fixes alien nest not blocking the victim from instantly unbuckling. The victim now needs to click the nest or resist, then wait 2 minutes before being free. 
Fixes alien nest buckling pixel offset.
Removes resist unbuckling 'success' message so there's not two unbuckling messages.
Fixes objects with buckling not unbuckling its buckled mob when the mob is gibbed (Fixes alien nest overlay not disappearing when larva burst and gib its host).
 2015-03-28 23:02:44 +01:00
Swag McYolosteinen
eca852a8c1 Merge pull request #8569 from sawu-tg/easterevent 
Easter is Out!
 2015-03-28 19:32:49 +01:00
phil235
c67423adf5 Fixes alien humanoids not being able to attack blobs. 
Created a take_damage() proc for obj/effect/blob.
Slight adjustment of the values of damage to blobs.
Fixes typo in pod people attack message (changed the verb from "slice" to "slash")
 2015-03-28 19:27:07 +01:00
Swag McYolosteinen
bdfd2a2f7c Merge pull request #8554 from RemieRichards/MonkeyHats 
Monkeys can wear hats!
 2015-03-28 13:47:35 +01:00
xxalpha
55b81363cc Merge remote-tracking branch 'upstream/master' into hardjet 
Conflicts:
	code/modules/clothing/spacesuits/hardsuit.dm
 2015-03-27 19:35:10 +00:00
hornygranny
8fba2cf22c Merge pull request #8551 from MrPerson/surgery_fun_removal 
Disallow doing surgery on yourself
 2015-03-27 11:52:00 -07:00
Cheridan
17067d9021 Merge pull request #8508 from phil235/SlimeAnimal 
Life refactor and slime as animal
 2015-03-27 13:38:16 -05:00
Sawu
c208a467fc Easter is Out! 
*Chickens have been refactored to be entirely interchangeable
*Rabbits have been added, they will bounce around and place eggs, even in space!
*A Rabbit Suit has been added, and can be won from opening easter eggs!
*A Easter Basket spawns in the tunnels, allowing for easy carry of Easter Eggs!
*Easter Eggs will spawn in maintenance
*Easter Baskets also spawn in maintenance.
 2015-03-27 20:52:24 +11:00
phil235
f8bd5a4259 Adds a temporary fix to the conflict with metastation map. 
Small fix in simple_animal life subproc.
 2015-03-26 18:55:05 +01:00
Remie Richards
5b20448e2b Monkeys can now wear hats! Monkeys can now also wear all masks, instead of the select few they had icons for (which have been removed, since they are no longer needed) 2015-03-26 15:23:52 +00:00
MrPerson
6881ac8c1d Disallow doing surgery on yourself 
This doesn't solve the fact you can lie down with stuff in your hand (which isn't a bug imo) but it does stop people from cutting their brains out or giving themselves plastic surgery.
Fixes #4001
 2015-03-25 22:17:03 -07:00
Jordie
a86b757d93 Merge pull request #8291 from Xhuis/nerf_thermal_vision 
Nerfs changeling augmented eyesight
 2015-03-26 13:01:25 +11:00
phil235
7a1232012b Fixes more merge conflicts 2015-03-26 02:52:04 +01:00
phil235
1b3eb49a1d Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal 
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/simple_animal/slime/say.dm
 2015-03-26 02:31:06 +01:00
phil235
92b0f9f4cd Adding a changelog. 
Some work on death() procs of many animals.
Replacing most istype(XYZ, mob/living/simple_animal/slime) by isslime(XYZ).
Some work on slime feeding procs.
Made simple animal aliens see in the dark like regular aliens (in case somone wants to control one).
 2015-03-26 02:23:39 +01:00
Jordie
31a808aa6d Merge pull request #8509 from Iamgoofball/spin 
Adds object spinning when thrown and *flip
 2015-03-26 12:02:53 +11:00
Szunti
0147d669f8 Added night vision to mining mobs. 2015-03-25 21:36:01 +01:00
Jordie
0e57fc6941 Merge pull request #8488 from Miauw62/whatsthedifferenceanyway 
Adds a verb_exclaim var. Fixes #8478.
 2015-03-25 16:31:16 +11:00
Jordie
ff90e1599c Merge pull request #8320 from AnturK/headcrabs 
Adds Headcrabs!
 2015-03-25 16:31:00 +11:00
AnturK
eadfecd552 - Makes body_egg parent for alien embryos/changeling eggs 2015-03-24 17:54:20 +01:00
AnturK
88f2eda81e - Headcrabs 
- Changelog & Name

- Description
- Removes debug message
- Fixes cavity surgery removal

Oops

- Headslug sprites courtesy of ZyloWalsh
- Squash
 2015-03-24 12:53:13 +01:00
Jordie
59af7cfd42 Merge pull request #8323 from Mandurrrh/miningborgupgrade 
Adds a cyborg upgrade module for the satchel of holding.
 2015-03-24 16:40:52 +11:00
hornygranny
1b16960f31 Merge pull request #8481 from Miauw62/agqgdoqio 
Re-adds forcesay
 2015-03-23 16:32:37 -07:00
hornygranny
2e04be734f Merge pull request #8449 from MrPerson/feature_removal_5 
Remove xylophone skeleton ribcage playing
 2015-03-23 15:10:11 -07:00
Iamgoofball
dc2bf262e6 Adds object spinning when thrown and *flip 2015-03-23 13:46:23 -07:00
phil235
b78ce020e7 fixing more stuff 2015-03-23 19:47:39 +01:00
phil235
17fb919020 More fixes 2015-03-23 17:11:07 +01:00
phil235
ffd711c26f Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal 
Conflicts:
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/simple_animal/friendly/corgi.dm
	code/modules/mob/living/simple_animal/slime/say.dm
	code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
 2015-03-23 16:51:03 +01:00
phil235
7aa21179e0 small adjustments 2015-03-23 16:34:48 +01:00
Razharas
6baed3a0e5 Merge pull request #8464 from Szunti/patch-1 
prob() with rand() is the same as a plain prob()
 2015-03-23 00:27:47 +03:00
Swag McYolosteinen
53e40ec315 Merge pull request #8427 from Cheridan/day3_collars 
Event Day 3 - Pet Collars!
 2015-03-22 19:37:12 +01:00
Cheridan
e5c3d421db Adds renaming, Adds collars to pet crates 2015-03-22 13:16:30 -05:00
Miauw
ba2a1c8f19 Adds a verb_exclaim var. Fixes #8478. 
Also makes saymods transmitted through the radio system for upcoming NTSL integration.
 2015-03-22 18:55:59 +01:00