cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,056 Commits 10 Branches 0 Tags
9dfc65b6280704d2e23a0e38cda9925a459649c0
Commit Graph

302 Commits

Author SHA1 Message Date
Zuhayr
e8bf2e4b8f Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hardsuitcontrol 2015-08-24 16:41:39 +09:30
PsiOmega
579c5be239 Makes observers use forceMove. 
This ensures things like OnEnter/Exit, light updates properly for all occasions when a ghost moves, not only for manual movement.
 2015-08-23 17:45:46 +02:00
Zuhayr
9cbacd6653 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hardsuitcontrol 
Conflicts:
	code/_onclick/click.dm
 2015-08-23 02:24:34 +09:30
Zuhayr
90e51b87e3 Refactoring hardsuit click checking. 2015-08-23 02:14:55 +09:30
mwerezak
d44e8cc0ab Adds missing TK move cooldowns, adjusts click move cooldowns 2015-08-21 23:21:54 -04:00
Zuhayr
a00ac82221 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hardsuitcontrol 
Conflicts:
	code/_onclick/rig.dm
 2015-08-22 02:36:05 +09:30
Kelenius
bed03443d1 Merge branch 'dev' into ofClicksAndCooldowns 
Conflicts:
	code/ZAS/Airflow.dm
	code/__defines/items_clothing.dm
 2015-08-21 16:15:07 +03:00
Chinsky
317eaf4771 Merge pull request #10101 from mwerezak/shards 
Refactors obj flags and changes defined bitflag representation
 2015-08-20 19:47:58 +03:00
GinjaNinja32
a9773207b2 Merge remote-tracking branch 'upstream/dev' into client_dir 2015-08-19 09:42:48 +01:00
mwerezak
ac738f3db4 Moves flags values to item_flags var 
Moves flags that seemed to pertain more to equipment to a new item_flags
var in /obj/item
 2015-08-18 17:18:25 -04:00
GinjaNinja32
1957029890 HUD cleanup, human/monkey HUD now turns correctly with client.dir 2015-08-18 18:21:25 +01:00
PsiOmega
0d10d53b65 Another Hurt/Harm fix. 
Apparently clicking the intents directly or cycling through them updates the icons differently. Nice.
 2015-08-18 18:41:24 +02:00
PsiOmega
75c7313c46 On merge changes and map conflict fixes. 2015-08-18 18:19:51 +02:00
Zuhayr
71214d859e Merge with master. 2015-08-18 11:31:10 -07:00
PsiOmegaDelta
edebf946d8 Harm icon state consistency. 
All icon states relating to the I_HARM intent now all use the same naming convention.
 2015-08-17 10:16:39 +02:00
Zuhayr
b265b3285c Cleaned up some errors, added logging for AI module use. 2015-08-13 17:15:51 +09:30
Zuhayr
86100ee2a4 Added procs for MMIs to use rigs as piloting AIs. 2015-08-13 17:09:25 +09:30
Zuhayr
59d0e28aff Allowed pAIs and AIs loaded into hardsuits to move and rest when control is enabled or the user is unconcious/dead. 
Allows AIs/pAIs in rigs to use the selected module via middle click.
 2015-08-13 17:09:22 +09:30
Kelenius
60196df634 Merge branch 'dev' into ofClicksAndCooldowns 
Conflicts:
	code/modules/projectiles/gun.dm
 2015-08-13 08:40:31 +03:00
GinjaNinja32
ea76feb3cd Compile fix 2015-08-11 18:47:25 +01:00
GinjaNinja32
631ff21980 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/game/objects/items/weapons/implants/implantcase.dm
	code/game/objects/items/weapons/melee/energy.dm
	code/modules/mob/living/carbon/human/emote.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/silicon/robot/drone/drone.dm
	code/modules/mob/living/silicon/robot/emote.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/nano/modules/crew_monitor.dm
	code/modules/organs/organ_internal.dm
 2015-08-11 18:47:05 +01:00
PsiOmegaDelta
617db485ee qdel/Destroy entries. 2015-07-21 14:22:01 +02:00
PsiOmegaDelta
616b4b60e4 Magical fixes. 
The wizard den is no longer pitch black.
Fixes targeted spells using the wrong caster/source.
Adds some missing checks using the caster source above.
Re-logging should no longer cause a loss of spell UI icons.
Mind transfer should no longer cause unintended spell loss.
 2015-07-21 11:34:25 +02:00
PsiOmegaDelta
388343a84e Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/machinery/recharger.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/mob.dm
 2015-07-20 08:28:32 +02:00
mwerezak
4ea1379b33 Fixes #10230 
Moves throw mode procs up to /mob level, clicking on a non-turf or an
atom that is not in a turf cancels throw mode.
 2015-07-18 23:27:09 -04:00
PsiOmega
cee5f1a057 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/objects/items.dm
 2015-07-06 18:33:09 +02:00
PsiOmega
cdb4270f48 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-07-06 17:31:41 +02:00
mwerezak
9468508226 Adds move cooldown for inventory management, clicking on adjacent atoms 2015-07-05 13:10:52 -04:00
GinjaNinja32
b8e0015be1 Changes cyborg HUD to not display a superfluous empty row 
Title. Modules with precisely 8, 16, 24 etc items were showing an extra row, this changes it from floor(X/8)+1 to just ceil(X/8).
 2015-07-04 14:47:10 +01:00
mwerezak
32b95445e3 Gives changeNextMove() a better name, default define 2015-06-30 22:29:45 -04:00
mwerezak
087a978d56 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into clickcooldown 
Conflicts:
	code/_onclick/click.dm
	code/_onclick/telekinesis.dm
	code/game/objects/items.dm
	code/game/objects/structures/grille.dm
	code/game/turfs/simulated/walls.dm
	code/modules/mob/living/carbon/resist.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
 2015-06-28 22:35:14 -04:00
GinjaNinja32
82aa88c777 Merge pull request #9862 from Zuhayr/dev 
Fixes
 2015-06-20 17:27:26 +01:00
Zuhayr
868781adef Fixes #9852 2015-06-20 21:17:10 +09:30
PsiOmegaDelta
dea924541c Emag refactoring. 
Emags now call a dedicated emag_act proc on atoms which then returns how many charges that should be use up.
 2015-06-15 15:22:32 +02:00
Kelenius
0071ed3f24 Merge branch 'dev' into ofClicksAndCooldowns 
Conflicts:
	code/_onclick/click.dm
	code/_onclick/telekinesis.dm
	code/game/machinery/deployable.dm
	code/game/objects/items.dm
	code/game/objects/structures/grille.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
	code/setup.dm
 2015-06-07 14:05:54 +03:00
GinjaNinja32
314a28fa75 Merge remote-tracking branch 'upstream/dev' into span_class=notice 
Conflicts:
	code/game/antagonist/station/rogue_ai.dm
	code/game/machinery/OpTable.dm
	code/game/machinery/floodlight.dm
	code/game/machinery/spaceheater.dm
 2015-06-02 17:33:20 +01:00
Zuhayr
4a7b728fa2 Used some defines. No idea if this is what they are for but they have the same values #yolo 2015-06-02 17:20:10 +09:30
Zuhayr
dadc434f4e Ported action button system from Paradise/tg 2015-06-02 17:17:13 +09:30
PsiOmegaDelta
659873d943 Merge pull request #9598 from mwerezak/knifing 
Polishes the knifing mechanic
 2015-05-31 18:50:12 +02:00
mwerezak
3f5976bc3b Updates knifing 
Fixes weirdness with knifing where attempting to knife someone before
`world.time >= (G.last_action + 20)` could be met.

Knifing damage scales with weapon force and an attempted measure of
throat protection.

Knifing switches on harm intent.
 2015-05-31 11:36:38 -04:00
GinjaNinja32
d09cd2fe57 Merge remote-tracking branch 'upstream/dev' into span_class=notice 
Conflicts:
	code/game/antagonist/station/rogue_ai.dm
	code/game/gamemodes/malfunction/Malf_Modules.dm
	code/game/jobs/job_controller.dm
	code/game/verbs/ooc.dm
 2015-05-29 21:55:37 +01:00
GinjaNinja32
e8f02b8496 Minor folders. code/defines, code/FEA, code/__HELPERS, code/_onclick, code/TriDimension, code/ZAS 2015-05-29 20:36:48 +01:00
Zuhayr
15070d729d Dev-freeze into dev merge. 2015-05-30 00:31:12 +09:30
Zuhayr
958494ae75 Removed IS_SYNTHETIC and REGENERATES_LIMBS flags. 
Moved some organ code around, added icons and limbs for IPC, added IPC limb manufacturer.
Reimplementing checks in place of IS_SYNTHETIC.
Rebalancing EMP a bit for IPC.
 2015-05-25 14:49:07 +09:30
GinjaNinja32
3b81d0987b soft_assert addition 2015-05-23 19:41:42 +01:00
GinjaNinja32
11af65d1e0 Changes hardsuit activation button to a per-client toggle. 
Currently toggleable between:
- middle-click (default)
- alt-click
- control-click
 2015-05-23 14:00:09 +01:00
Atlantis
97f0470504 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into newmalf-merge 2015-05-22 21:01:26 +02:00
Kelenius
6d54e1c655 Merge branch 'dev' into ofClicksAndCooldowns 
Conflicts:
	code/game/turfs/simulated/walls.dm
	code/modules/mob/living/carbon/resist.dm
	code/modules/mob/mob_grab.dm
 2015-05-21 17:00:50 +03:00
mwerezak
20b72b9911 Adds attack animation calls 2015-05-20 00:18:32 -04:00
Atlantiscze
090112c874 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into newmalf-merge 2015-05-13 06:17:26 +02:00