cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-17 12:35:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,525 Commits 61 Branches 14 Tags
e0a14d899d308dabff372b05abf55e5d500ff4bc
Commit Graph

2580 Commits

Author SHA1 Message Date
PKPenguin321
8e09b00f2c Merged upstream 2015-11-28 15:49:41 -08:00
Cheridan
2fc49bbcad Merge pull request #13265 from PKPenguin321/kor-you-lazy-fuck 
Mounted Chainsaw Inhands 2.0
 2015-11-28 17:01:35 -06:00
PKPenguin321
36d92b8c2d fixes everything 
i broke everything by giving teleprods a unique attack_self but forgetting to include the original functions of attack_self, making them unable to turn on/off. this fixes that.
 2015-11-28 14:57:36 -08:00
Razharas
e715e1cc57 Merge pull request #13195 from neersighted/nanoui_update 
[WIP|DNM] Update NanoUI
 2015-11-28 14:17:49 +03:00
PKPenguin321
5382db940d adds mounted chainsaw inhands, repaths mounted chainsaws to actually use them, makes the lines for mounted chainsaws use tabs instead of filthy spaces 2015-11-27 14:56:23 -08:00
Remie Richards
62d301bfe5 Merge pull request #12998 from YotaXP/drone-fixes 
Allows drones to use 'pick up' and watertanks
 2015-11-27 20:38:23 +00:00
Bjorn Neergaard
5f108eef4e Merge remote-tracking branch 'tgstation/master' into nanoui_update 2015-11-27 15:31:35 -05:00
Bjorn Neergaard
b897fb6d72 Fix NanoUIs flashing, update Tanks, Solars, and Canisters 2015-11-27 15:30:18 -05:00
YotaXP
68dbc7cf27 Code formatting! 
Dat online PR editor.
 2015-11-27 15:18:16 -05:00
Remie Richards
fdede51a09 Merge pull request #12954 from MMMiracles/spookycaves 
New Away Mission: Caves
 2015-11-27 20:11:26 +00:00
PKPenguin321
cf29721672 fixes conflicts, adds the ability to remove the crystal from the prod via using it when no cell is attached 2015-11-26 18:28:12 -08:00
PKPenguin321
7e640d3463 Merge branch 'master' of https://github.com/tgstation/-tg-station into teleprods 2015-11-26 17:42:59 -08:00
Bjorn Neergaard
1a44e3d851 Refactor NanoUI API 
Also update NanoUI-using code to the new API.
 2015-11-26 07:11:31 -05:00
MMMiracles
2d94b0ff9b feedback changes: 
added more loot
nerfed the spawn rates and health of the spawners
widened the paths of some areas for lava passages
added a medbay area to the first level incase of stupid people not coming prepared
added 2 mining rigsuits, may be difficult to get though
fixed(?) issues with dicklys drilling ladders and basalt floors causing issues
 2015-11-25 23:24:42 -05:00
PKPenguin321
67153e54d3 fixes tgstation.dme since i cucked it by unticking a file accidentally, also makes the teleprods use the correct inhands 2015-11-25 19:03:28 -08:00
PKPenguin321
10f9e4af4f adds teleprods, a way to make them with bluespace crystals and a stunprod, and a tablecrafting recipe 2015-11-25 18:36:09 -08:00
swankcookie
d56c24f841 SM Sword 2015-11-22 23:44:23 -06:00
Cheridan
4c899d2b34 Merge pull request #13063 from Incoming5643/subtypesof 
Adds subtypesof(path)
 2015-11-19 16:31:09 -06:00
Cheridan
cba8a9a325 Merge branch 'c4runtimeFix' of git://github.com/phil235/-tg-station into phil235-c4runtimeFix 
Conflicts:
	code/modules/mob/mob.dm
 2015-11-18 01:44:29 -06: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
YotaXP
4ece522dff Removed snowflake. 2015-11-15 02:34:17 -05:00
Cheridan
9a68f6b69b Merge pull request #13003 from Incoming5643/stop_being_broken_at_being_broken 
The further trials and tribulations of the supermatter sword bugfix
 2015-11-14 11:49:55 -06:00
Incoming
bf34b97b1e Gives supermatter swords a better check for adjacency, and moves the parent code below the dust code to be extra sure <b>nothing escapes</b>. 
I started up a test server and was smacking people to dust like a pro, armor or not.
 2015-11-13 01:13:05 -05:00
YotaXP
47c358e8e2 Adds slot_drone_storage macro. 2015-11-12 20:32:00 -05:00
YotaXP
e42b1630c5 Allow drones to use and unequip watertanks. 
Fixes #6139
 2015-11-12 20:29:14 -05:00
duncathan salt
df6ac90baa Revert "Revert "Merge pull request #12067 from AnturK/resequencing"" 2015-11-12 15:25:31 -06:00
Razharas
3992858ed1 Revert "Merge pull request #12067 from AnturK/resequencing" 
This reverts commit d5fd4440ea, reversing
changes made to 605710d0ec.

Reverting this bullshit
 2015-11-12 21:11:50 +03:00
duncathan salt
d5fd4440ea Merge pull request #12067 from AnturK/resequencing 
Changes to DNA Injectors
 2015-11-11 10:50:30 -06:00
duncathan salt
0769ba5c00 Merge pull request #12945 from torger597/master 
Adds a Syringe to the Uplink Poison/Chemical kit
 2015-11-11 10:47:40 -06:00
duncathan salt
8bb0043ec7 Merge pull request #12939 from KorPhaeron/really_bad_ideas 
Adds a series of ridiculous weapons to the wizard spellbook
 2015-11-11 10:47:04 -06:00
duncathan salt
9339662a28 Merge pull request #12768 from xxalpha/windows10 
Made it possible to paint windows to make them opaque.
 2015-11-11 10:32:18 -06:00
AnturK
d82010caf3 Makes injectors timed 
Update
Lowers the scanner buffer transfer radiation.
Makes injector duration scale with upgrades.
Time coefficent values
 2015-11-11 17:27:55 +01:00
phil235
79d25ef2d9 Fixes remotely detonating planted c4 with signaler. 
Move CanUseTopic() procs to the correct files.
 2015-11-11 15:57:05 +01:00
Torger597
c76a9526d5 Adds a Syringe to the Uplink Poison/Chemical kit 
Useful for:
1: Poisoning food.
2: Injecting Chemicals directly rather than being forced to feed someone
from a bottle.
 2015-11-09 19:57:28 -06:00
KorPhaeron
780dfe8db1 Ridiculous weapons 2015-11-09 07:17:10 -06: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
Tkdrg
d966c37c6a Hand of God Fixes/Tweaks 
Fixes healing fountain construction sprite.
Nexus are now destroyed properly.
Borged cultists will now lose antag status properly.
Round end message fixed.
Feedback messages improved to be clearer, and lots of typos fixed.
Smite no longer uses up faith if there is no valid target in the turf.
Adds an atom/attack_god() proc.
Fixes the greeting messages for prophets and followers, improves god msg.
Fixes nexus being spawned on dense turf after 2min, and general sanity.
Fixes attacking structures with abstract items.
Adds click delay and attack animation for attacking structures.
Fixes a lot more typos.
Fixes defense pylon friendly fire.
Makes defense pylon togglable on its god's click.
Cleans up gun_turret code a little in general.
Adds deconversion by loyalty implant or holy water (basically rev+cult).
Gods will now die when they have no followers left.
Adds the HoG gods to the traitor panel.
 2015-11-07 15:25:28 -03:00
Razharas
58cecbfb3a Merge pull request #12561 from phil235/ChemistryManual 
Adds a chemistry manual.
 2015-11-07 06:12:58 +03:00
Razharas
db672c359e Merge pull request #12834 from Incoming5643/supermatter_sword 
Supermatter sword fixes
 2015-11-07 06:09:26 +03:00
Nerd Lord
0f23809346 Revenant changes XVIII 
Made the abilities easier to tweak and somewhat less copypasta. They're still for() loops though.
Check the changelog for additional details.
 2015-11-05 18:50:51 -05:00
phil235
2399ecc455 Merge branch 'master' of https://github.com/tgstation/-tg-station into ChemistryManual 
Conflicts:
	icons/obj/library.dmi
 2015-11-05 17:03:24 +01:00
Incoming5643
555c37625b Adds force and armour_penetriation to the supermatter sword 2015-11-03 02:47:26 -05:00
Cuboos
f136955d80 Created a new flashbang sound and a ringing effect for when you go deaf, very realistic, it's almost like your ears are actually bleeding (NOTE: that is a joke, this isn't actually a painful sound, i checked) 2015-11-01 18:51:00 -08:00
xxalpha
9f4db8078b Made it possible to paint windows to make them opaque. 
Not tinted windows

Changed how painting and opacity work.

Clean timer
 2015-11-01 16:26:54 +00:00
Razharas
8b22368202 Merge pull request #12678 from MMMiracles/asmartidea 
Esword Embedding
 2015-11-01 16:17:01 +03:00
Incoming
74f00a016d Merge branch 'master' of https://github.com/tgstation/-tg-station into supermatter_sword 
Conflicts:
	icons/mob/inhands/items_lefthand.dmi
	icons/mob/inhands/items_righthand.dmi
	icons/obj/weapons.dmi
 2015-10-31 19:56:13 -04:00
Incoming
a9138e84c1 *Adds supermatter sword sprites 
*Makes bullets that hit the supermatter sword get eaten
*Fixes some edge cases where a sword could eat itself
*Improves atmos handling
 2015-10-31 19:48:24 -04:00
Razharas
9ee8d1c256 Merge pull request #12589 from Cheridan/5e 
Upgrades Paladin to Fifth Edition
 2015-11-01 02:09:01 +03:00
Razharas
590644c06e Merge pull request #12686 from Firecage/jetpackobjective 
Changes jetpack objective
 2015-10-31 21:42:07 +03:00
Jordie
a09d69e985 Merge pull request #12330 from feemjmeem/tanksuicide-refactor 
re-enable tank suicide, but retain body and all objects
 2015-10-29 14:27:37 +11:00