cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-20 05:55:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,576 Commits 61 Branches 14 Tags
f1e293504cb4d9c22ea8611bd4dbfde2ea3b8a13
Commit Graph

31176 Commits

Author SHA1 Message Date
Jordie
f1e293504c Merge pull request #21315 from ChangelingRain/siliconapplication 
Clockcult "Convert All Silicons" objective now also requires that Application scripture is unlocked
 2016-11-03 09:06:44 +11:00
Joan Lung
25dc7d25c5 Proselytizing a window will automatically proselytize the grille under it (#21314) 
* Proselytizing a window will proselytize the grille under it

* fancy
 2016-11-03 10:19:49 +13:00
oranges
f57357a049 Merge pull request #21316 from ChangelingRain/unflappable 
Plastic flaps are once again immune to being hit in melee
 2016-11-03 10:11:17 +13:00
oranges
04a6fc47f2 Merge pull request #21319 from ExcessiveUseOfCobblestone/geishaoncemore 
GeishAgain!
 2016-11-03 10:10:51 +13:00
oranges
8ebf0c0ea3 Merge pull request #21320 from Mervill/master 
Late joining won't runtime if the emergency shuttle does not exist (dev QoL)
 2016-11-03 10:00:17 +13:00
oranges
dc6c51086f Merge pull request #21312 from JJRcop/chronofixyetagain 
Fixes chronosuit not checking if held items are chronosafe
 2016-11-03 09:50:08 +13:00
oranges
2feb302b2d Fix duplicate species id's (#21287) 
Unique id's for both krokodil humans and infectious zombies
Unique id for the ashwalker lizard subspecies

Uses the correct limbs_id var to ensure their icons reuse the
appropriate icons of correct species
 2016-11-02 08:51:02 -04:00
Cheridan
19c6919e88 Merge pull request #21309 from phil235/ClonePodRuntimeFix 
Fixes two runtime from clonepod.
 2016-11-02 06:05:11 -05:00
Joan Lung
02e54446d8 Hulks no longer oneshot literally every clockwork structure (#21283) 
* Hulks no longer oneshot literally every clockwork structure

* rrrrr

* why the fuck did you ask me to make this a proc????

* hulks, why.
 2016-11-02 22:52:42 +13:00
Joan Lung
ff69c5c631 Mending Motors are overall more powerful (#21281) 
* Mending Motors are overall more powerful

* that fucking capitalization always gets me
 2016-11-02 22:52:15 +13:00
Cheridan
a72658206a Merge pull request #21282 from ChangelingRain/helptheocularwardenisbeatingme 
Ocular Wardens no longer attack restrained targets
 2016-11-02 03:27:54 -05:00
Cheridan
1ff1dc1542 Merge pull request #21307 from tgstation/AnturK-patch-1 
Fixes a typo.
 2016-11-02 03:25:57 -05:00
Iamgoofball
dca887760d Adds a new lobby sound. (#21304) 
* Adds a new lobby sound.

It's a surprise! I'm gonna go make a sandwich now. Thanks a lot, bye-bye.

* i did not

* Update ticker.dm

* Update world.dm

* Update ticker.dm

* Update ticker.dm
 2016-11-02 21:24:33 +13:00
oranges
e2e0400a91 Merge pull request #21292 from XDTM/WhosThere 
Makes ninja stealth make you mostly transparent instead of 100% invisible
 2016-11-02 16:20:23 +13:00
phil235
b7efc2cef4 Make energy guns able to use burst fire. (#21005) 
* Make energy guns able to use burst fire.

* Changed obj/item/weapon/gun/projectile to /gun/ballistic and the name of the folder from "projectile" to "ballistic" to avoid confusion between actually projectiles and guns.

Syringe gun, energy guns and magic guns can now use burst fire.

* fixing merge conflict shit

* fixing map conflicts

* more map conflict fix

* two tiny fixes.

* tiny tweak

* fixing merge conflicts.
Moving the practice mini egun to the gun module.
Renamed nuclear.dm to energy_gun.dm

* map conflict fixes
 2016-11-02 16:16:21 +13:00
Joan Lung
4c7ecda6b8 good code 2016-11-01 13:33:27 -04:00
Cheridan
c30441148e Merge pull request #21308 from phil235/AlienAcidFix 
Fixes alien acid not melting turfs.
 2016-11-01 09:16:22 -05:00
Cheridan
72e08593f1 Merge pull request #21295 from Iamgoofball/patch-142 
You can cauterize with a laser gun now.
 2016-11-01 09:12:24 -05:00
Cheridan
37c6f1e1ae Merge pull request #21310 from ChangelingRain/gearbits 
Brass windows and windoors no longer drop full sheets of brass when destroyed
 2016-11-01 09:09:51 -05:00
Mervill
fbf85c3a1b Merge branch 'shuttlefix' 2016-10-31 21:36:25 -07:00
Mervill
acfd3004a0 Avoid runtimes in late joining, throw warnings at startup if the emergency shuttle does not exist 2016-10-31 21:26:39 -07:00
Joan Lung
ee76078d16 Merge pull request #21060 from phil235/Color_washing 
Adding var/list/atom_colours to /atom .
 2016-10-31 21:12:29 -04:00
phil235
0876b424a7 Tiny fixes and suggested changes. 
Blight ability will still color your hair, and will be cleared when cured.
 2016-11-01 01:59:23 +01:00
ExcessiveUseOfCobblestone
67b14be455 no merge conflicts pls 2016-10-31 20:00:27 -04:00
Tacolizard
8a57efc8ab very minor atv crate tweaks (#21244) 
the atv crate has been changed from a plain crate to a large one because realism.
the price has been lowered from 3000 to 2000 
the crate includes a leather overcoat and skull bandana so you can make a biker gang
it's been renamed the Biker Gang Kit
 2016-11-01 11:35:24 +13:00
oranges
687967a685 Merge pull request #21271 from JJRcop/youarekiddingmerightwheredidmycodebabbygoyoukilledityoumonster 
Readds the day the world ended
 2016-11-01 11:32:16 +13:00
oranges
6a411a5a97 Merge pull request #21266 from kevinz000/revert1 
Reverts Hardlight Bows
 2016-11-01 11:31:40 +13:00
Joan Lung
80c8c23b91 only if ai 2016-10-31 18:18:58 -04:00
Joan Lung
883e7f745b Plastic flaps are once again immune to being hit in melee 2016-10-31 18:06:33 -04:00
Joan Lung
ae8eac2977 Clockcult "Convert All Silicons" objective now requires Application scripture to also be unlocked 2016-10-31 16:32:55 -04:00
Joan Lung
8577ed02bf big gear big gear 2016-10-31 16:15:10 -04:00
duncathan salt
6f909d3748 Merge pull request #21261 from Xhuis/fix_bundle 
Fix bundle
 2016-10-31 13:58:27 -06:00
AnturK
8a66f3147b Fixes two more runtimes (#21278) 
* I don't know what this equation is supposed to do, but byond does not support imaginary numbers out of the box

* Sanity check for bombs

* Assume 0 value if negative.

* There is no revert commit button on github.
 2016-10-31 13:37:08 -06:00
phil235
e5a079b982 Fixes merge conflict stuff. 
Readds the lines about coloring hairs and mutant parts in revblight (even though they're no longer needed, but it's a reminder that the color change is a trick and we need to replace it with a proper forced limb coloring like it used to).
 2016-10-31 20:19:15 +01:00
phil235
2dc956bea0 Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing 
# Conflicts:
#	code/game/gamemodes/clock_cult/clock_scripture.dm
#	code/game/gamemodes/clock_cult/clock_structures.dm
 2016-10-31 19:59:00 +01:00
AnturK
373cfd8303 Fixes dental implant runtime (#21256) 
* Fixes dental implant runtime

* oranges is right
 2016-10-31 19:51:54 +01:00
ExcessiveUseOfCobblestone
059a900e3f Removes Stray Space in Species_type in an effort to save the world. (#21286) 
* Fixes Zombies / Flags for Species

* GO BACK

* Reverts Defines
 2016-10-31 19:45:34 +01:00
JJRcop
8d871d0777 Fixes chronosuit not checking if held items are chronosafe 2016-10-31 13:01:08 -04:00
Cheridan
2ae59bf7dc Merge pull request #21280 from ChangelingRain/axemeaquestion 
Brass windows are now slightly harder to destroy
 2016-10-31 11:08:44 -05:00
Joan Lung
571fefd307 Merge pull request #21276 from lzimann/patch-15 
Fixes a runtime with weather
 2016-10-31 11:45:55 -04:00
Joan Lung
550293de9a Merge pull request #21279 from lzimann/whydolingshaveamindswap 
Removes ling "Swap form" ability
 2016-10-31 11:43:17 -04:00
Joan Lung
d0f0b74957 Clockwork windows and windoors no longer drop full sheets of brass when destroyed 2016-10-31 10:27:31 -04:00
phil235
e2c5cbb334 Fixes two runtime from clonepod. 
Moves countdown effects into the effect folder instead of being in their own module.
 2016-10-31 14:34:25 +01:00
phil235
d1bbfd92ba Fixes alien acid not melting turfs. I also made turf melting a bit faster to be consistent with airlock melting. (around a minute) 2016-10-31 13:42:57 +01:00
AnturK
64a2753ce9 And the other one 2016-10-31 12:52:47 +01:00
AnturK
b6e2d67098 Fixes a typo. 2016-10-31 12:21:15 +01:00
Cheridan
d169779424 Merge pull request #21273 from bgobandit/immortalization 
Adds a suicide message to an object lacking one.
 2016-10-31 05:07:59 -05:00
Iamgoofball
2885eab9f3 You can cauterize with a laser gun now. 
it's a laser it makes sense
 2016-10-30 17:21:39 -07:00
XDTM
66a7fde82d ALMOST invisible 2016-10-31 00:35:49 +01:00
oranges
0b0482a8a6 Merge pull request #21205 from MrStonedOne/patch-260 
stop_procress now attempts to remove even if its not processing
 2016-10-31 11:13:25 +13:00