coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
27,543 Commits 9 Branches 11 Tags
2edfd114bdfec94de063141b37b69888a0e3355f
Commit Graph

191 Commits

Author SHA1 Message Date
swankcookie 5328dc8271 added "breath" 2015-12-12 17:43:01 -06:00
swankcookie b95c5e6c00 removed "gas" 2015-12-12 16:39:08 -06: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
Nerd Lord 6b72222dbf Gives blobs a fukken hud, with buttons and everything. 
Blobs can now expand just by clicking.
Shield blob creation changed to ctrl-click.
Reverted expand cost to 5.
 2015-11-20 11:58:55 -05:00
YotaXP 47c358e8e2 Adds slot_drone_storage macro. 2015-11-12 20:32:00 -05:00
Tkdrg 88f64c607e Ghost HUD tweaks 
Removes links in tooltips. Makes alerts work as clicks when applicable.

Fixes #12843
Fixes #12844
 2015-11-08 22:53:41 -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
xxalpha c313bd2c46 Fixed buckled, handcuffed and legcuffed alert buttons not calling resist. 2015-11-02 18:57:52 +00: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
Razharas 282dae922e Merge pull request #12762 from GunHog/Of-Scanners-And-Bugfixes 
Research scanner fixes
 2015-11-01 23:32:34 +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
GunHog d98b9bef4a Research scanner fixes 
Fixes a bug in which fumbling around with more than one scanner device
equipped at a time can cause weird bugs either preventing their use or
vise versa.

Fixes a bug where removing a scanner with it active requires two clicks
to activate it again.
 2015-10-30 14:40:15 -05:00
Cheridan 377b686237 Merge pull request #12727 from Razharas/IconHud 
Makes ghost hud only animate on mouseover
 2015-10-30 13:15:39 -05:00
Remie Richards f3266a411c Merge pull request #12661 from KorPhaeron/mudamudamuda 
Parasite HUD and rebalancing
 2015-10-30 05:19:07 +00:00
Incoming 4ae1cf4eb5 Merge branch 'master' of https://github.com/tgstation/-tg-station into slime_time_live 
Conflicts:
	icons/mob/actions.dmi
 2015-10-29 23:08:28 -04:00
Razharas 67324c5b54 Merge pull request #12708 from GunHog/I-am-pretty-sure-WJ-owns-me-now 
Xenomorph sprites and tweaks!
 2015-10-30 04:20:30 +03:00
Razharas 0d10ff8810 Makes ghost hud only animate on mouseover 
Makes ghost hud only animate on mouseover
Fixes #12707
 2015-10-29 16:12:47 +03:00
Incoming e3b9fd2f1e Merge branch 'master' of https://github.com/tgstation/-tg-station into slime_time_live 2015-10-28 18:14:15 -04: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
GunHog 1e25dab29f New Xeno Sprites! 
- Added new Xeno sprites by WJohn!
- New blood trails!
- New Xeno blood and gibs!
- Removed walk/run mode from Xenos.
- Alien sneaking is now an action button, small delay when sneaking.
- Fixed NPC xenos missing sprites
 2015-10-27 22:32:06 -05:00
Razharas 9357602233 Merge pull request #12665 from tkdrg/ghost_medsechuds 
[READY] Adds a ghost on-screen HUD
 2015-10-28 05:19:19 +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
Tkdrg 1ca8237dba Readds ghost verbs. Makes the ghost HUD togglable 2015-10-26 22:57:08 -03:00
Razharas 39d861cf44 Merge pull request #12043 from kingofkosmos/firescreenalert 
Screen alert for being on fire
 2015-10-26 19:17:40 +03:00
Tkdrg 8e775a18ff Adds a ghost on-screen HUD 
Removes the ghost verbs and adds an on-screen HUD.
 2015-10-26 03:22:29 -03:00
KorPhaeron 49dfb52cea Parasites 2015-10-25 21:42:47 -05:00
Remie Richards b99ecdfbe0 Merge pull request #12597 from AnturK/atoningmycodingsins 
Action Button Minor Rework Cleanup
 2015-10-25 23:02:59 +00:00
Remie Richards 9e96641f53 Merge pull request #12543 from AnturK/screenlocstuff 
Action button screenloc cleanup
 2015-10-25 22:55:13 +00:00
Remie Richards 2ad13eea59 Updates ToolTips system to V1.1, by Wirewraith 2015-10-22 21:40:16 +01:00
AnturK 77d3260894 Action Button Cleanup 
Removing action_type in lieu of subtypes
 2015-10-22 21:34:27 +02:00
Remie Richards 124fc81cdb Adds tooltips to Screen Alerts, showing their name and their helptext, shift-click remains in in-case you want the information without keeping your mouse over the alert. 2015-10-21 13:23:49 +01:00
Remie Richards 910f280a3b Moves procs to appropriate files, Adds some sanity+feature wrapper procs for Tooltips, adds some UI style themed CSS classes to use as tooltip themes (Auto used by the wrapper if no theme specified) 2015-10-21 12:53:45 +01:00
AnturK b849b5c9bf action button screenloc cleanup 2015-10-20 23:55:08 +02:00
kingofkosmos a733924782 Makes fire screen alert resist when you click on it + fixes few typos. 2015-10-16 21:05:37 +03:00
kingofkosmos f52dd1cb1f Merge branch 'master' of https://github.com/tgstation/-tg-station into firescreenalert 2015-10-16 19:43:34 +03:00
MrPerson 610483ea1e Mild rewrite of screen alerts to enable more functionality 
Specifically I wanted to allow #12043 to correctly implement clicking an "on fire" alert to call resist without affecting other alerts which is currently impssible. Plus this whole mess was stupid and bothering me so here we go.
 2015-10-13 17:16:23 -07:00
GunHog dcbcfefa01 Action buttons + More mobs! 
- Scanner control is now an action button.
- Fixed multiple scanner bugs (I think)
- Gave ability to drones and borgs.
 2015-10-08 11:30:39 -05:00
Remie Richards 97de4b2ebe Merge branch 'master' of https://github.com/tgstation/-tg-station into HandOfGod-Resurgence 
Conflicts:
	code/modules/mob/living/simple_animal/guardian/guardian.dm
	icons/mob/head.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/storage.dmi
 2015-10-07 22:24:53 +01:00
duncathan 4475824890 fixes #12143 2015-10-04 07:33:32 -06:00
Remie Richards 58483beb50 Hand of god gamemode! 
be_special and antag defines are no longer limited to 16 values (1 - 32768) by being changed from a bitfield to a list, an appropriate block of code exists to automatically update bitfield versions to the new list format. the list format allows us to have (functionally) infinite antag types.
 2015-09-27 16:49:56 +01:00
kingofkosmos a3b7625c96 Adds "On Fire" screen alert. Resists when you click it. 
Adds a warning-message when you try to help-intent someone who's on fire.
Makes fire spread from burning people who are lying down take 2 seconds if you stand on top of them. Spreading is immediate if you're covered in flammable stuff.
 2015-09-27 12:33:26 +03:00
bear1ake f697ae90f5 removes a bunch of .0 2015-09-10 20:57:30 +09:00
duncathan 51c09f16bf makes all Destroy()'s return properly 2015-08-31 00:21:01 -06:00
Ergovisavi 3737234b9c -Adds swarmer as a language, makes them only able to speak to each other 
-Fixes a few structures/machines taking non brute/burn damage from attack_animal
-Adjusts girders to be a little less resistant to explosions
-Span classes all the swarmer messages, bumps their health up to 40
-Adds ability for swarmers to dismantle machines and disable cameras. Some are obviously protected.
 2015-08-27 22:10:30 -07:00
Ergovisavi 9572bd6aa6 -First revision of Swarmer mob, hud, icons, etc 
-Adds functionality of ignored damage types to simple mobs
-Adds functionality of melee damage types to simple mobs
 2015-08-25 03:24:34 -07:00
phil235 bf6b830fb0 Fixes action button not updating correctly sometimes (b/c the change from del to qdel means the button wasn't null after Removal which fucks with the action update procs) 
Fixes infinite loop when deleting a camera mob.(Destroy calls qdel which calls Destroy)
 2015-08-23 14:47:44 +02:00
Firecage dfae1e0b53 Changes a lot of del() to qdel() 2015-08-16 23:33:22 +02:00
Jordie 933cdc1c0c Merge pull request #11002 from AnturK/bizzaro 
Some action button fixes
 2015-08-05 14:50:23 +10:00
c0 667d5e75c3 Transferred body eggs to new organs system 2015-08-03 23:24:17 +03:00
AnturK 47e6942f85 One lookup less 2015-08-03 17:17:14 +02:00