cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-26 09:03:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,547 Commits 61 Branches 14 Tags
dcb8f18ea911df2d6b4d8a841bdcbef58dbc352f
Commit Graph

712 Commits

Author SHA1 Message Date
arty23
d5cbc036cf Matter bin description grammar fix 
made matter bin descriptions more grammatically correct, applies to all research levels
 2015-12-31 22:52:03 -06:00
tkdrg
a3533519ea Merge pull request #13995 from KorPhaeron/tokiwotomare 
Timestop fixes
 2015-12-28 19:44:08 -03:00
KorPhaeron
f314b99777 Fixes timestop loops 2015-12-28 05:30:26 -06:00
KorPhaeron
15ca0ae3d9 Timestop fixes 2015-12-24 07:38:08 -06:00
Tkdrg
8947b4e94f Adds xeno golems to admin log 
Also makes golems use key_name(), key_name_admin() and adminmoreinfo.
 2015-12-24 00:45:00 -03:00
AndrewJacksonThe2nd
1ab5e80458 Tesla map removal to fix merge 2015-12-19 12:32:50 -08:00
LatD
9b3cc34fc6 I think I fixed this 2015-12-16 23:14:14 +02:00
LatD
2f17d1c4fe Missing one empty line? 2015-12-16 22:54:00 +02:00
LatD
de431d8642 Gives tech requirements for 4 roundstart mech items 2015-12-16 22:19:13 +02:00
tkdrg
d52b94cc86 Merge pull request #13610 from KorPhaeron/sentience_act 
Xenobio sentience clean up/fixes
 2015-12-16 04:31:16 -03:00
KorPhaeron
c301b51e9a Sentience Fixes 2015-12-13 08:06:54 -06:00
KorPhaeron
d8a37204e7 Makes burn_state use defines 2015-12-13 05:36:55 -06:00
Razharas
02fe4ec5a8 Merge pull request #13443 from MrStonedOne/DONTWAIT-IKNOWWHATYOURTHINKING-YOUDONTNEEDMYRETURN-DONTWAITCAUSEISLEEP 
changes `spawn() throw_at` to `throw_at_fast set waitfor = 0`
 2015-12-06 19:52:06 +03:00
MrStonedOne
9fa4288b08 Makes everything that used spawn () throw_at use throw_at_fast 2015-12-05 16:40:52 -08:00
Razharas
41341461b0 Merge pull request #13393 from kingofkosmos/fewinhandsprites 
In-hand sprites: transfer tank valve, tracking beacon, pizza box & carp plushie
 2015-12-05 01:14:20 +03:00
kingofkosmos
03b751aafa Makes the bluescape rapid part exchange device share the same in-hand sprite with the normal RPED. 2015-12-02 18:19:10 +02:00
YotaXP
7de857b476 Upgrades the space heater! 2015-11-30 04:11:10 -05:00
Remie Richards
b6209e4508 Merge pull request #13139 from AnturK/XXXFREEINSULATEDSWITHEVERYPURCHASEXXX 
Adds Send To All to Lawyer/Captain cartridges
 2015-11-27 20:58:03 +00:00
Remie Richards
f55246e5c0 Merge pull request #12987 from AnturK/turrets 
Removes gun_turret type and makes turret controls buildable
 2015-11-27 20:52:59 +00:00
phil235
da0ba3659f Merge pull request #13239 from AnturK/animalbots 
Simple Animal Bots - Beepsky strikes back.
 2015-11-27 17:37:59 +01:00
Cheridan
762568255d Merge pull request #13102 from bgobandit/newmininggear 
Various mining additions, fixes, nerfs and buffs (ready for review/merge).
 2015-11-26 18:11:26 -06:00
AnturK
e36853d7c9 Convert bots to simple animals - Updated 7.0 2015-11-26 22:06:07 +01:00
Cheridan
67da7b7117 Merge pull request #13085 from Incoming5643/I_only_get_like_one_controversal_pull_a_year_I_better_make_this_count 
A number of nerfs and buffs to stunning spells
 2015-11-25 11:13:09 -06:00
AnturK
c9dc0b7998 Makes turret control panels buildable 2015-11-25 14:41:18 +01:00
bgobandit
f435f18d6b fixed gunhog's shit, added new KA/res to asteroid rooms, added mesons to mech scanner 2015-11-24 07:18:54 -05:00
bgobandit
bcd456eea1 Added new PKA, R&D designs, tweaked numbers, honked the honk up the honk 2015-11-23 18:44:54 -05:00
AnturK
05cb510dc7 Neater 2015-11-23 19:31:28 +01:00
bgobandit
899e6ecaf9 Merge branch 'master' of https://github.com/tgstation/-tg-station into newmininggear 
Conflicts:
	_maps/map_files/DreamStation/dreamstation04.dmm
 2015-11-18 19:55:06 -05:00
bgobandit
47dcbc2fd0 Various mining additions, fixes and rebalances. 2015-11-18 19:14:28 -05:00
Incoming
b12fc38946 A number of mixed nerfs and buffs to stunning spells: 
Lightning Bolt:
*You can no longer throw the bolt whenever you want, it will fire itself once it's done charging. Fixes #12849
*Getting hit by a bolt will do a flat 30 burn now, as opposed to scaling with how long you spent charging the spell. Unless you made a habit of charging lightning bolt to near maximum every time you cast it this is a buff.
*Every time the bolt jumps the next shock will do five less burn damage.
*Lightning bolts can still jump back to the same body, so the maximum number of bolts you can be hit by in a single casting is three, and the maximum amount of damage you could take for that is 60 burn.
*Stun time is unaffected

Magic Missile:
*Cooldown raised to 20 seconds, up from 15
*Cooldown reduction from taking the spell multiple times raised from 1.5 seconds to 3.5 seconds. Rank 5 magic missile now has a cooldown of 6 seconds, down from 9, and is effectively a permastun.

Time Stop:
*Time Stop field now persists for 10 seconds, up from 9
*Cooldown raised to 50 seconds, up from 40
*Cooldown reduction from taking the spell multiple times raised from  7.75 seconds to 10 seconds. Rank 5 time stop now has a cooldown of 10 seconds, up from 9, and is effectively a permastun.
 2015-11-17 19:04:38 -05:00
Incoming
1f9f0dfc40 Adds subtypesof(). It's shorthand for typesof(path) - path. 
Replaces typesof(path) - path with subtypesof(path) in obvious places. I was a bit conservative, there's probably a few more places that could use this.
 2015-11-16 18:55:57 -05:00
Razharas
7489f929f2 Merge pull request #12964 from GunHog/Nanotrasen_Pindication 
Reduces Loyalty Firing Pin tech requirement
 2015-11-17 00:59:41 +03:00
Tkdrg
8c694d9fc0 R&D and Misc Fixes/Tweaks 
Fixes invisible gasmask exploit.
Fixes mineral duplication exploit in protolathe.
You can no longer break a RD Console while a linked machine is busy.
Adds cancel button to admin Send To.

Fixes #12729
Fixes #12197
Fixes #11741
Fixes #11449
 2015-11-14 13:35:05 -03:00
as334
a6eaf76d72 Fixes merge conflicts, adds new sprites, hopefully fixes weird helmet sprite bug. 2015-11-12 21:54:08 -05:00
GunHog
a7bc20cba7 Reduces Loyalty Pin tech requirement 
- Loyalty pins now require Combat 5 instead of 6.
- Loyalty pins can now be replaced by other pins.
 2015-11-11 09:43:19 -06:00
Aranclanos
d454eae1b1 Merge pull request #12916 from tkdrg/ripinpiss 
Removes PDA chatrooms
 2015-11-09 02:56:41 -03:00
Tkdrg
20fe2e4bb5 Removes PDA chatrooms 
Nobody used them, and they were cluttering PDA Topic() needlessly.
Rest in peace, my child. You were too good for this world.
 2015-11-07 23:51:48 -03:00
Tkdrg
8fce742d0a Merge remote-tracking branch 'upstream/master' into fuk 
Conflicts:
	data/mode.txt
	icons/mob/mob.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/gloves.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/shoes.dmi
	icons/obj/clothing/suits.dmi
 2015-11-07 15:56:39 -03:00
Razharas
9e69eafef1 Merge pull request #12836 from KorPhaeron/chill 
New dark blue slime reaction (fireproofing potion)
 2015-11-06 19:42:17 +03:00
KorPhaeron
eaf87bb7f9 Burn state 2015-11-05 08:06:39 -06:00
KorPhaeron
6f76380705 New dark blue slime reaction 2015-11-03 04:26:58 -06:00
KorPhaeron
e60d0f9203 Fix for jordie 2015-11-02 00:43:33 -06:00
Tkdrg
e2187614fd Merge remote-tracking branch 'upstream/master' into hog-mergeconflicts 
Conflicts:
	code/__DEFINES/hud.dm
	code/__HELPERS/game.dm
	code/_onclick/hud/_defines.dm
	code/_onclick/hud/hud.dm
	code/game/gamemodes/antag_spawner.dm
	code/game/gamemodes/game_mode.dm
	code/game/machinery/turrets.dm
	code/modules/client/preferences_toggles.dm
	code/modules/events/alien_infestation.dm
	code/modules/mob/dead/observer/observer.dm
	code/modules/mob/living/carbon/alien/special/alien_embryo.dm
	code/modules/mob/living/simple_animal/revenant/revenant.dm
	icons/mob/back.dmi
	icons/mob/head.dmi
	icons/mob/hud.dmi
	icons/mob/inhands/items_lefthand.dmi
	icons/mob/inhands/items_righthand.dmi
	icons/mob/mob.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/items.dmi
	icons/obj/projectiles.dmi
	icons/obj/storage.dmi
 2015-11-02 01:06:30 -03:00
KorPhaeron
e5f59edfae Xenobio fixes 2015-11-01 21:05:06 -06:00
KorPhaeron
86b966e64f Fix 2015-11-01 14:19:57 -06:00
KorPhaeron
36d747acb6 Xenobio cam fix 2015-11-01 09:36:06 -06:00
KorPhaeron
5a781f93df Merge remote-tracking branch 'refs/remotes/tgstation/master' into xenobiology2 2015-10-31 21:47:10 -05:00
KorPhaeron
8b2fec9281 Icons, monkey recycle 2015-10-31 17:56:29 -05:00
Razharas
aa3198afd1 Merge pull request #12749 from GunHog/This-is-why-you-remember-to-SYNC! 
Missing Diagnostic HUDs commit
 2015-10-31 21:37:29 +03:00
Razharas
f78289c60e Merge pull request #12716 from GunHog/Charge-ALL-The-Guns! 
Buildable Rechargers!
 2015-10-31 05:10:04 +03:00