cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,106 Commits 5 Branches 0 Tags
9201240f33120d339db752ecde4d77374423ae48
Commit Graph

262 Commits

Author SHA1 Message Date
EmperorJon
9201240f33 Merge pull request #1446 from Yoshax/followfix 
Adjusts check to fix double click moving as observer
 2016-04-20 13:22:46 +01:00
Yoshax
e6392ee5d1 Adjusts check to fix double click moving as observer 2016-04-19 18:08:08 +01:00
HarpyEagle
38ffd7306b Adds click cooldowns for attacking non-mob atoms for various mob types 2016-04-18 15:23:22 +01:00
Neerti
da53a9ea60 Aim Intent Changes 
Manually ports https://github.com/Baystation12/Baystation12/pull/12614 's fix to not make examining trigger the autofire.
The toggle to shoot if the target talks on the radio defaults to off.
The aim intent icon now updates when clicked.
 2016-04-16 02:30:47 -04:00
EmperorJon
1555ff98e1 Merge pull request #1384 from Datraen/DarkClick 
Manually ports /tg/'s darkclick code.
 2016-04-09 15:57:23 +01:00
Datraen
9c21e0bcdc Manually ports /tg/'s darkclick code. 
https://github.com/tgstation/-tg-station/pull/10272 by Razharas.
 2016-04-08 23:07:10 -04:00
PsiOmegaDelta
52ecd6dbe1 Ghosts can now follow any /atom/movable object. 2016-04-07 19:26:57 +01:00
Neerti
a9ad84da4b Merge pull request #1191 from Kelenius/inventoryCleanup 
Mob inventory cleanup
 2016-03-22 21:42:27 -04:00
Datraen
996ce92f7f Merge pull request #1184 from Yoshax/510prep 
Ports Byond 510 preperations from Bay
 2016-03-20 13:45:40 -04:00
Datraen
fe9d3fd4c4 Merge pull request #1027 from Kelenius/mobCleanup 
Changes types of ghosts and eyes
 2016-03-18 13:50:47 -04:00
Kelenius
afbc235b96 Mob inventory cleanup 2016-03-15 16:39:40 +03:00
Yoshax
8be10d96dd Ports Byond 510 preperations from Bay 
Updates comment

Updates supply file
 2016-03-14 18:21:44 +00:00
Datraen
1b40fb3bfe Traitor Borg lockdown, blowing-up fixed; can now self-hack. 2016-03-12 17:03:28 -05:00
Yoshax
b2916bbb56 Splits underwear into top and bottom 2016-03-11 19:26:50 +00:00
Kelenius
b9a9a7eb88 Merge branch 'master' into botFixes 2016-03-01 14:48:24 +03:00
Neerti
23b15390dd Merge pull request #893 from Kelenius/AIHud 
AI hud
 2016-02-26 20:31:40 -05:00
Kelenius
acc78a8000 Changes types of ghosts and eyes 
``/mob/dead/observer`` -> ``/mob/observer/dead``
``/mob/eye`` -> ``/mob/observer/eye``

Reason being that they are similar in that they both don't interact with
the world in any way. Some procs were shared, some checks as well, and
it overall makes more sense this way. Plus, there were no ``/mob/dead``
mobs.
 2016-02-20 15:36:05 +03:00
Neerti
b7a3a98ef0 Ling nerfs, ear protection cleanup, and ling bugfixes. 2016-02-14 19:58:57 -05:00
Zuhayr
7c3993b68b Revert "Revert "Bay update."" 2016-02-07 16:33:30 +10:30
Zuhayr
98d983577c Revert "Bay update." 2016-02-07 16:07:05 +10:30
Neerti
f2cd67fe16 Merge pull request #810 from Zuhayr/bayupdate 
Bay update.
 2016-02-05 23:21:07 -05:00
Kelenius
906b03e736 Gives AI the hud, sorts the verbs 
Removes 'AI IM' category
Adds 'AI settings' category
Unnecessary verbs are hidden by default but can be shown/hidden again by
using a verb
 2016-02-05 17:21:04 +03:00
Kelenius
cf244e07d6 Mulebots are now mobs 
obj/machinery/bot removed completely
Mulebot hacking removed, you can still disable their safety.
Mulebot PAD interface redone.
 2016-02-02 17:51:50 +03:00
Kelenius
c9c9dde819 Removes old unticked code 2016-02-01 12:47:20 +03:00
Zuhayr
d5b904ca2a Merge branch 'master' of https://github.com/PolarisSS13/Polaris 2016-01-26 11:11:55 +10:30
Datraen
28e48e1c6a Fixes #828 2016-01-23 22:51:04 -05:00
Zuhayr
36c0bb0f13 Merge branch 'master' of https://github.com/PolarisSS13/Polaris 2016-01-22 01:33:09 +10:30
Zuhayr
f89948d666 Added functionality for two-handed gun use. 2016-01-21 00:51:54 +10:30
Zuhayr
e557a71fdc Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 2016-01-20 08:01:14 +10:30
Zuhayr
f93ea6a78f Tweaks to previous commits. 
More tweaks to IPC fixes.
Merge resolution/compile fixes.

Further work on properly integrating, updating and fixing prosthetic options.

Repathed internal organs to organ/internal.

More work on full synthetics, changelings, overheating.

Working on getting organs to qdel properly and spawn properly when robotized.

Finalized some overheating values, added remaining prosthetic icons.

Finalizing the testing version of the full prosthetic bodies branch.

Added suit cyclers to the autolathe and map.

Fixing runtime errors.

Fixing errors.

Changelog.

Replacing limb and organ strings with constants.

Prevented brainless species from becoming full cyborgs.

Fixed issues with brain/MMIs renaming themselves inappropriately.

Various fixes and oversights.
 2015-12-24 21:13:40 +10:30
PsiOmegaDelta
5d3d0c5dc3 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/material/kitchen.dm
 2015-12-20 11:22:08 +01:00
PsiOmegaDelta
f62f24e1ac Removes Stat() sleep. 
Fixes a Stat() runtime that occasionally occur if the client was logged out when the sleep() was done sleeping.
Fixes delays when using alt+Turf click.

Makes the alt+Turf click panel only update when viewed instead. Seems like the better performance fix option in general.
Makes the alt+Turf click panel always use the "Turf" name, consistency.
 2015-12-16 13:24:40 +01:00
Zuhayr
b38a42c665 Compile fixes/port fixes. 2015-12-16 10:53:10 +10:30
Zuhayr
6e8368ac4c Rewrote targeting. 2015-12-16 10:26:40 +10:30
Zuhayr
0148e78eda Removed targeting. 2015-12-16 10:25:18 +10:30
PsiOmegaDelta
4d8ff90857 Wizard spell Destroy() additions. 
Backport of #11586. Fixes #11555.
 2015-12-04 09:48:46 +01:00
PsiOmegaDelta
67ba794f0c Corrects Wizard spell overlay positioning. 
Includes some Destroy() cleanup.
Fixes the rest of  #11583. Fixes #11555.
 2015-12-04 09:15:42 +01:00
Zuhayr
4487db9c14 Fixes several issues with drones. 2015-12-01 09:38:12 -05:00
Neerti
dd3ab4dac0 Finishes new ling, need better sprites but that's for another time. 2015-11-18 16:20:28 -05:00
Neerti
4f77afece1 Revert 58ef59734f 2015-11-08 10:09:14 -05:00
Neerti
45f15930a0 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge 
Conflicts:
	.travis.yml
	code/_helpers/lists.dm
	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
	code/global.dm
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	code/modules/reagents/dispenser/dispenser2.dm
	polaris.dme
 2015-11-06 17:41:18 -05:00
mwerezak
07881e7495 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into attack-cleanup2 
Conflicts:
	code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm
 2015-10-15 07:08:16 -04:00
Neerti
bbe8c336b2 Adds socks. 
Conflicts:
	code/modules/client/preferences_savefile.dm
 2015-10-11 00:13:33 -04:00
Neerti
e52a0ea332 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015 
Conflicts:
	.travis.yml
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/turfs/simulated.dm
	code/global.dm
	icons/misc/fullscreen.dmi
	polaris.dme
 2015-10-10 23:17:26 -04:00
PsiOmegaDelta
019c147bdc HUD element positioning. 
HUD positions are now relative the client view screen edges instead of absolute.
We don't currently use custom client view ranges, but this potentially makes it more reasonable to implement (an example is a new short sighted species of ours).

Port of https://github.com/d3athrow/vgstation13/pull/5984.
 2015-10-06 12:51:03 +02:00
HarpyEagle
7f066065d3 Merge remote-tracking branch 'upstream/dev' into attack-cleanup2 
Conflicts:
	code/modules/mob/living/simple_animal/friendly/spiderbot.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
 2015-10-05 19:20:33 -04:00
PsiOmegaDelta
9dd1a54191 Destroy tweaks. 
Ports Destroy() proc tweaks from Paradise and /tg/, sourced from https://github.com/ParadiseSS13/Paradise/pull/2091.
Adds returns in Destroy()s, to prepare for future return values.
 2015-09-25 10:44:23 +02:00
LightningIron
9e2edf5ab4 Fixes #11145. 2015-09-20 19:42:54 -05:00
GinjaNinja32
c014866ac9 Remove unneccessary /area/start definition 2015-09-12 08:46:50 +01:00
mwerezak
af52b475ff Fixes missing cooldowns, missing cult blade sound. 2015-09-09 15:15:43 -04:00