cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-20 14:04:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,316 Commits 61 Branches 14 Tags
e93fc3c6d204ca8b59bca209e9612a89d6d2ea79
Commit Graph

1674 Commits

Author SHA1 Message Date
phil235
77de108fe7 Merge pull request #13143 from Anonus/blobactors 
Fixes up blob_act()
 2015-11-22 18:42:15 +01:00
phil235
ab1e9f2d15 Merge pull request #13160 from Firecage/optablefix 
Fixes op table buckling Take #2
 2015-11-22 18:38:19 +01:00
Firecage
e1891440fa Fixes op table buckling 2015-11-22 19:29:26 +02:00
Nerd Lord
f458c2cead The blob eats nondense things in all cases. 
Probably fixes one or two bugs in the process.
 2015-11-20 21:03:43 -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
duncathan salt
1a54000a35 Merge pull request #13020 from Xhuis/this_pr_was_a_time_sink 
Sink changes
 2015-11-15 16:02:14 -06:00
Xhuis
a24ddbd7b7 Sink changes 2015-11-14 09:44:39 -05:00
phil235
e20e03562a Fixes your shield blocking the bullets when committing suicide with a gun. 
Merged kill_count and range var into one var/range for obj/item/projectile.
Simplified projectile/proc/Range().
Fixes timestoped projectiles still calling Range() and thus being deleted despite being stopped.
Fixes projectile being invisible when on the first tile in front of the shooter (which meant no sprite showing when shooting a target 1 tile away)
Simplifies kinetic/Range()
 2015-11-12 19:45:50 +01: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
phil235
5e43d2b570 Merge pull request #12924 from Firecage/Optable 
Changes the operating table to be an actual table.
 2015-11-11 17:31:38 +01:00
duncathan salt
e5f8c3f941 Merge pull request #12900 from KorPhaeron/laserbox 
Immovable reflectors for admins/mappers
 2015-11-10 23:21:20 -06:00
Firecage
9ce5334890 merge conflict fix 2015-11-10 18:44:10 +02:00
Firecage
618e54087d Makes abductor Optables not deconstructable. 2015-11-10 17:21:12 +02:00
Cheridan
5f2ed41bc6 Merge pull request #12873 from KorPhaeron/zipties 
Captain and HoP lockers now contain zipties
 2015-11-10 08:03:53 -06:00
Firecage
b2937bf315 Changes the operating table to be an actual table. 2015-11-08 22:09:35 +02: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
KorPhaeron
ba4cb7a565 Laserbox 2015-11-07 04:22:30 -06:00
KorPhaeron
f332f595a2 zip ties 2015-11-05 18:03:12 -06: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
Razharas
cd1454a71c Merge pull request #12794 from kingofkosmos/altclickcheckfix 
Alt+click checks fix
 2015-11-03 04:19:38 +03:00
KorPhaeron
47d1d57a69 Removes spam 2015-11-01 17:04:49 -06:00
Razharas
3cd68567ab Merge pull request #12754 from KorPhaeron/headsets 
Adds normal captains headset to captains locker
 2015-11-02 01:35:25 +03:00
Remie Richards
046948f314 Merge pull request #12630 from KorPhaeron/Reflector 
Laser Reflector Structure
 2015-11-01 21:46:29 +00:00
KorPhaeron
99cc8aca9a Proper istype 2015-11-01 15:36:28 -06: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
KorPhaeron
f58dcd9e5d 3 types 2015-11-01 09:08:15 -06:00
kingofkosmos
e75d24a6c9 Changes checks in altclicks from canusetopic to incapacitated. 2015-11-01 11:24:17 +02:00
KorPhaeron
f45b34e73b Cleaner code 2015-11-01 01:39:33 -06:00
Cheridan
3e3aa2ee9f Merge pull request #12748 from MrStonedOne/sweetsweetdimlight 
[Pretty Pictures!] [map] Makes starlight have far spreading low levels of light rather than near spreading high levels of light.
 2015-10-31 22:22:39 -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
615275f71f Merge pull request #12496 from kingofkosmos/interactivescreenalerts 
More interactive screen alerts and workarounds for the resist-button
 2015-10-31 15:13:15 +03:00
MrStonedOne
8c755da84f Adds a way to make certain area/space areas not force 100% brightness 2015-10-31 02:30:49 -07:00
KorPhaeron
354a03ea37 Headset 2015-10-30 05:30:42 -05:00
GunHog
336b57bd5a Missing Diagnostic HUDs commit 
For some reason, the final commit for DiagHUDs was lost. This adds
Diagnostic HUDs to roboticist lockers, the protolathe properly, fixes
the night HUD's onmob sprite and adds a quick changelog.
 2015-10-30 00:45:31 -05:00
Cheridan
89f8b0eea5 Merge pull request #12697 from KorPhaeron/biobag 
Moves biobags under biosuits
 2015-10-28 16:37:19 -05:00
kingofkosmos
2c0f178e31 Embedded object -alert can be clicked to remove the object. 
When handcuffed, a handcuffed-alert appears and clicking it is the same as clicking on resist. Same with legcuffing.
Moving in a Suit Storage Unit or welded/locked locker or morgue tray is now the equivalent of pressing resist.
 2015-10-28 21:10:50 +02:00
Razharas
a59d4c47f0 Merge pull request #12234 from Incoming5643/flapping_intensifies 
Modifies plastic flaps to defeat the secret box technique.
 2015-10-28 19:39:45 +03:00
Razharas
980b3ec4a3 Merge pull request #12071 from KorPhaeron/captainqol 
Small tweaks to captains starting equipment
 2015-10-28 19:36:09 +03:00
Tkdrg
dd20530f0e Adds ghost alerts. 
Adds ghost alerts for revival (cloning, MMIs, nar-sie, drones, etc).
 2015-10-27 23:07:41 -03:00
KorPhaeron
fe6adf6cc1 Biobag 2015-10-27 16:13:43 -05:00
Incoming5643
c4af09089c no comment 2015-10-24 23:44:22 -04:00
Incoming
5b3215a6d7 @memo incoming wow making sure you update to master sure is hard huh? 2015-10-24 23:43:26 -04:00
Incoming
ddbfec6fbc Merge branch 'master' of https://github.com/tgstation/-tg-station into flapping_intensifies 
Conflicts:
	code/game/machinery/computer/shuttle.dm
 2015-10-24 23:32:55 -04:00
KorPhaeron
eb37baeb64 Cleanup, beams only 2015-10-24 06:44:31 -05:00
KorPhaeron
c003925c24 Reflector 2015-10-24 04:49:42 -05:00
Cheridan
6bfa738a24 Merge pull request #12567 from phil235/EffectSystemTweak 
Makes effect system code more OOP.
 2015-10-22 21:00:10 -05:00
phil235
be4b3a6857 Merge pull request #12478 from Firecage/Mirrorfixing 
Adds fixing mirrors.
 2015-10-22 19:16:55 +02:00
Firecage
40b149ade7 Removes one indent from the return. 2015-10-22 19:11:23 +02:00
phil235
c7670dc627 Merge pull request #12558 from Bawhoppen/medbaysigntypo1 
Fixes medbay sign description typo
 2015-10-22 12:41:26 +02:00