cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,106 Commits 5 Branches 0 Tags
1dcad7f92dd0b83328713df6cfbccda6b81069af
Commit Graph

281 Commits

Author SHA1 Message Date
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
Hubblenaut
32b463237f Final adjustments to icons, adds delay to pinning 2015-05-12 17:21:37 +02:00
Hubblenaut
1b3ddb8633 Merge remote-tracking branch 'upstream/dev' into dev 
Conflicts:
	code/game/objects/structures/stool_bed_chair_nest/bed.dm
	code/modules/mob/mob_grab.dm
 2015-05-12 14:39:21 +02:00
PsiOmega
b52cf35680 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/projectiles/projectile.dm
 2015-05-12 13:40:47 +02:00
ccomp5950
569e785014 Holodeck items no longer spam admin attack logs. 
/obj/items now has no_attack_log variable if set to 1, it won't log.

All holodeck items and lasertag weapons have no_attack_log set.

<3 Mangled
 2015-05-11 22:11:46 -04:00
Hubblenaut
fb8812d1b7 Adds knifing, pressing eyes, jointlocking, headbutting, pushing, dancing and forcing onto the floor 
fixup
 2015-05-10 17:54:34 +02:00
Kelenius
695392e150 Fixes webbings and coats 2015-05-10 15:11:32 +03:00
Kelenius
3fa79f8d51 Removes click cooldowns almost everywhere. 
Still have: doors, windoors, cameras, windows, grilles, blobs, resisting, alien stuff, mechas, spray bottles.
Setting changeNextMove is now responsibility of the item being attacked.
Adds a config option to eliminate click cooldowns completely. Intended to be used by devs.
 2015-05-09 17:27:19 +03:00
Atlantiscze
024dabef7b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into newmalf-merge 2015-05-05 22:13:58 +02:00
PsiOmega
151c5204ee Merge remote-tracking branch 'upstream/master' into dev 
Conflicts:
	code/modules/projectiles/gun.dm
	html/changelogs/RavingManiac-master.yml
 2015-05-05 08:11:28 +02:00
RavingManiac
6123c8421e Intent menu appears on zoom 2015-05-04 16:58:24 +10:00
PsiOmega
1ae0ad6d92 Updates the atom_pool, now datum_pool, to handle any datum object. 
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
 2015-04-24 09:59:05 +02:00
PsiOmega
a6a428af6a Mecha + misc. Destroy() because I had already begun. 2015-04-17 09:55:59 +02:00
PsiOmega
d381eb6083 Drops the machinery part of the singularity. 2015-04-16 12:51:02 +02:00
PsiOmega
1511e2b3f4 Ports /vg/'s Nas-Sie remake. 
Second phase:
New Nar-Sie itself.
Two endgame phase - Nar-Sie and Supermatter Cascade.
Culty mobs.
 2015-04-12 16:19:16 +02:00
PsiOmega
990530d118 Ports /vg/'s spell system for the sake of cult porting. 
Does offer a much more pleasant basis to work with in the future, if someone wishes to add more spell-like abilities.
 2015-04-09 20:08:06 +02:00
Chinsky
4a897e47b9 Merge pull request #8641 from PsiOmegaDelta/CultVisualNetwork 
Cult Visual network
 2015-04-06 20:19:49 +03:00
Mustafa Kalash
6e710ad426 Fixes switch operators. 2015-04-03 22:10:23 -04:00
Mustafa Kalash
3c767c50fa Refactors 2015-04-03 21:33:33 -04:00
Mustafa Kalash
94a56e3c2b Adds a toggle for allowing a target to use a radio (handheld or headset.) 2015-04-03 17:42:16 -04:00
Atlantiscze
4e2769710b Initial Newmalf port 
- Ports TSA Newmalf code.
- Complete overhaul of Malfunction. New modular abilities, 12 of which are in game by default.
- Adds AI hardware. AI may have only one piece and it gives unique boost in certain area (turrets strength, secondary power supply, etc.)
- Adds hardware drivers - these abilities control AI's hardware such as the APU power supply or self destruct explosives.
- Station overtake was changed to "hack all APCs" ability instead. When completed self-destruct is unlocked. Timer for station self destruct increased to 2 minutes. AI may activate/deactivate the self destruct at will.

Please bear in mind this is only INITIAL COMMIT. More commits are to follow. Minimal player count is now set to 1 but will be 2 when finished.
 2015-04-03 23:00:29 +02:00
PsiOmega
cf45daa66c Cuts out for now unnecessary parts, to allow merge of functional code. 2015-04-01 12:51:02 +02:00