cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-19 21:46:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,705 Commits 61 Branches 14 Tags
6ac3d8f2e8345ede59970e272139f3307429443c
Commit Graph

225 Commits

Author SHA1 Message Date
Razharas
4998b19ddf Merge pull request #5679 from Aranclanos/projectilesBump 
Projectiles bump fix, spawn() removal
 2014-11-27 03:38:05 +03:00
Razharas
ebfb3b012d Fixes runtimes of the mechs 
Fix #5777
 2014-11-22 18:34:41 +03:00
tkdrg
4ef217cfb3 Fixes AI shortcuts skipping turret sanity checks 2014-11-18 16:25:10 -03:00
tkdrg
608dec814e Removes old/unused code from the tree. Use version control if you need it for some reason. 2014-11-16 16:53:18 -03:00
Razharas
2ec1658be0 Merge pull request #5735 from phil235/StingMiddleClickRuntimeFIx 
Moving carbon/middleclickon() form carbon.dm to click.dm
 2014-11-15 02:51:24 +03:00
Remie Richards
17607d0aa2 Merge pull request #5776 from MrPerson/throwing_changes 
Throwing bugfixes
 2014-11-14 18:04:00 +00:00
phil235
fce8781994 Merge branch 'master' of https://github.com/tgstation/-tg-station into StingMiddleClickRuntimeFIx 
Conflicts:
	code/modules/mob/living/carbon/carbon.dm
 2014-11-13 17:44:09 +01:00
MrPerson
c159878ace Throwing bugfixes 
Removed an unused client verb, changed a usr to src where they're the same mob, and changed a type == check to istype().

Allow turning on throw mode when clicking the UI button (hotkeys already allow you to do this).
Disallow throwing when not on a turf.
Fixes #4823

Make storage items close out the onscreen stuff when they get thrown.
Fixes #5296
 2014-11-09 00:29:20 -08:00
Remie Richards
2054cbda08 Merge branch 'master' of https://github.com/tgstation/-tg-station into DiseaseRework 
Conflicts:
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/human/human_attackpaw.dm
	code/modules/mob/living/carbon/monkey/monkey.dm
 2014-11-08 01:07:29 +00:00
Remie Richards
0914b1a7cd Merge pull request #5642 from phil235/AttackAnimation 
Adding an attack animation to most attacks
 2014-11-07 18:39:27 +00:00
phil235
4bdafd02b6 Moving carbon/middleclickon() form carbon.dm to click.dm and centralising it (there was two carbon/middleclickon() proc. 
Moving carbon/altclickon() to click.dm as well.
 2014-11-07 19:23:30 +01:00
phil235
bc5754b378 adding diagonal attack animation. 2014-11-07 15:42:07 +01:00
Remie Richards
09e6825b5d Merge pull request #5692 from Aranclanos/TKihateyou 
Computers and telekinesis fix
 2014-11-06 21:56:31 +00:00
Aranclanos
f7ad6d9ab0 Fixes issue #1442 
canUseTopic() will now check for telekinesis on humans, using the be_close flag.
The pop-up window will update if TK users are using the machine.
 2014-11-05 13:55:31 -03:00
JJRcop
3675d40161 Fixes #5656 
I forgot to make the cyborg pull button use /obj/screen/pull
 2014-11-04 19:38:15 -05:00
Aranclanos
364f4e1f24 Changes the call from process() to fire() in all places where a projectile is created. 2014-11-04 16:38:58 -03:00
phil235
74f8a08522 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackAnimation 
Conflicts:
	code/modules/mob/living/living.dm
 2014-11-04 18:55:07 +01:00
hornygranny
bd0b4a39af Merge pull request #5558 from JJRcop/whoa_obj-screen-click_is_really_bad 
Turns /obj/screen/Click() into subtypes
 2014-11-03 17:20:45 -08:00
JJRcop
3318f50cd2 Fixes path typo 2014-11-03 12:21:57 -05:00
phil235
1506383b2c Adding some missing do_attack_animation() 
Moving do_attack_animation() proc to mob/living
Fixing the pixel offset issue from beds especially rollerbed.
Fixing the nograv bouncing stopping because of another animation being used.(lying down, jittering, attack animation)
 2014-11-03 15:11:39 +01:00
phil235
3f30912c51 WIP - Adding attack animation to most attacks. 
Fixing a couple "for(......) show_message()".
 2014-11-02 22:50:58 +01:00
JJRcop
2dabc8fd39 Turns /obj/screen/Click() into subtypes 2014-10-30 15:49:38 -04:00
Remie Richards
dfda08cc63 Merge branch 'master' of https://github.com/tgstation/-tg-station into DiseaseRework 
Conflicts:
	code/game/machinery/bots/medbot.dm
 2014-10-30 06:32:13 +00:00
Remie Richards
fa184f5487 Cuts /disease variables from 28 to 23 (includes new ones) 
a disease may now have more than one spread type
added "infectivity" variable which replaces a prob(65), defaults to 65
affected_species is now viable_mobtypes, and lists typepaths, this is due to us actually having a species system now so it's confusing
adds defines for a bunch of stuff
 2014-10-30 06:21:14 +00:00
GunHog
63b2fc2555 Merge remote-tracking branch 'remotes/upstream/master' into Botcall_TG_Edition 
Conflicts:
	code/game/machinery/bots/ed209bot.dm
 2014-10-22 17:49:52 -05:00
GunHog
20bd9976b7 Merge remote-tracking branch 'remotes/upstream/master' into Botcall_TG_Edition 
Conflicts:
	code/game/machinery/bots/bots.dm
	code/game/machinery/bots/cleanbot.dm
	code/game/machinery/bots/ed209bot.dm
	code/game/machinery/bots/floorbot.dm
	code/game/machinery/bots/medbot.dm
	code/game/machinery/bots/mulebot.dm
	code/game/machinery/bots/secbot.dm
	code/game/objects/items/devices/PDA/cart.dm
 2014-10-21 18:06:04 -05:00
Francis
adf252df9b Keep the define around as that is a good idea 2014-10-20 22:49:06 +13:00
Francis
6eb4793801 Revert "Adds click cooldown to clicking on mobs Fixes #4812" 
This reverts commit 7116584db1.
 2014-10-20 22:23:19 +13:00
Francis
5f8380304a Revert "Make handcuff click cooldown a define" 
This reverts commit 7da7fdbaab.
 2014-10-20 22:23:07 +13:00
Francis
25d587a483 Revert "Cleaning up unecessary cooldown changes" 
This reverts commit 970c61844f.
 2014-10-20 22:22:51 +13:00
hornygranny
3224cdc151 Merge pull request #5182 from RemieRichards/XenoLeaping 
Alien hunter leap ability
 2014-10-17 07:36:57 -07:00
Remie Richards
4256e2f264 Merge branch 'master' of https://github.com/tgstation/-tg-station into XenoLeaping 
Conflicts:
	icons/mob/alien.dmi //Curse you WJ!
 2014-10-15 15:08:12 +01:00
Aranclanos
d2d92dd35f Merge pull request #4873 from optimumtact/clicktyclackety 
Adds click cooldown to clicking on mobs Fixes #4812 Take2
 2014-10-15 11:03:02 -03:00
Swag McYolosteinen
cd60db5e18 Merge pull request #5124 from MrPerson/implant_action_button 
Give implants an action button
 2014-10-11 18:15:44 +02:00
Remie Richards
d9dd60418d Alien hunters can now leap, Hitting a mob stuns it, Hitting anything dense stuns the alien for a short time 2014-10-11 02:40:27 +01:00
Francis Devine
970c61844f Cleaning up unecessary cooldown changes 2014-10-09 14:49:28 +13:00
Francis Devine
7da7fdbaab Make handcuff click cooldown a define 2014-10-09 14:49:28 +13:00
Francis Devine
7116584db1 Adds click cooldown to clicking on mobs Fixes #4812 2014-10-09 14:49:27 +13:00
Cheridan
f96b017149 Merge pull request #5097 from phil235/Msg1Fix 
Fixing a lot of messages
 2014-10-07 12:09:01 -05:00
MrPerson
1995ac638b Allow activating implants even when stunned and such 
Make ninja implants show up right
Add a changelog for the action_button stuff
 2014-10-07 01:04:10 -07:00
Cheridan
f5b5ead3ef Merge pull request #4516 from MrPerson/examinate_the_doctor 
Change examine() from an atom verb to a mob verb
 2014-10-05 23:37:34 -05:00
phil235
dd7a3b7fbc Merge branch 'master' of https://github.com/tgstation/-tg-station into Msg1Fix 
Conflicts:
	code/modules/admin/admin_verbs.dm
 2014-10-05 13:48:11 +02:00
Cheridan
e8a56ee14b Merge pull request #4949 from hornygranny/alienpockets 
alien pockets removed
 2014-10-04 23:53:06 -05:00
Cheridan
08be1b34eb Revert "Changes a few green crosses to blue on sprites that I missed last time" 2014-10-04 19:22:10 -05:00
phil235
537280b4b9 Removing many instances of the no longer used second argument of message_admins() proc. 
Replacing "for(var/mob/M in viewers()) M.show_message()" by "visible_message()" or audible_message()" in many places.
Changing a few span classes.
 2014-10-05 01:29:30 +02:00
MrPerson
651c3e6db5 Merge to master - sole conflicting file was ninja.dm FUCK NINJAS 2014-10-04 01:45:39 -07:00
GunHog
589c1f4cbb Botcall, TG edition! 2014-09-25 09:44:41 -05:00
Hornygranny
e05c21502b alien pockets removed 
resin stacking removed
 2014-09-22 15:29:09 -07:00
Remie Richards
be079897e1 Adds default toolbox for drones, Moves drone hud to drone hud file, ticks drone hud file. 2014-09-21 20:39:29 +01:00
JJRcop
7356d49b04 Adds some missing drone things from the previous PR: 
+Missing head/mask slot because drones.dm is not currently being compiled
 +Missing weapon/storage not allowing drones to MouseDrop
 +Missing uplink buy() preventing non-humans to use it
 +Missing syndrone sprites

Adds new drone things that weren't in the previous PR:
 +Drone pings respect factions
 +Moved drone ping message functionality into its own proc
 +Alerts all drones about newly activated/reactivated drones
 +Alerts all drones about dead drones
 +Gives the syndrone the "syndicate" faction, overriding the default "neutral"
 ->Redirected gib() to dust()
 ->Redirected update_inv_l_hand() to update_inv_hands()
 ->Redirected update_inv_r_hand() to update_inv_hands()
 ->Redirected update_inv_wear_mask() to update_inv_head()
 2014-09-21 01:20:20 -04:00