cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 12:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
00fa623c9d9119245998b51bc8d1cc8d7390aea4
CHOMPStation2/code/modules/mob
History
Neerti 00fa623c9d Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	.travis.yml
	code/controllers/configuration.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/security.dm
	code/game/machinery/Sleeper.dm
	code/game/machinery/computer/communications.dm
	code/game/machinery/cryopod.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/turfs/simulated/floor.dm
	code/game/turfs/simulated/floor_types.dm
	code/global.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	polaris.dme
2015-08-23 01:30:46 -04:00
..
dead
Merge remote-tracking branch 'upstream/dev' into 150705-SecretAdminDatums
2015-08-20 14:16:35 +02:00
freelook
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2015-08-23 01:30:46 -04:00
language
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-15 11:06:03 +02:00
living
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2015-08-23 01:30:46 -04:00
new_player
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-22 15:44:02 +01:00
animations.dm
Refactors floating and magboot checks. Fixes #10256
2015-08-03 23:19:04 +10:00
death.dm
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-07-27 10:20:20 +02:00
emote.dm
…
gender.dm
Changes gender-based words to use a datum list instead of switches.
2015-07-15 20:04:33 +01:00
hear_say.dm
All the span-corrected dm files.
2015-06-14 22:08:14 +02:00
holder.dm
Minor holder refactor.
2015-08-13 17:31:42 +09:30
inventory.dm
Fixes issues with raider equipping
2015-07-04 16:32:35 -04:00
login.dm
…
logout.dm
…
mob_cleanup.dm
…
mob_defines.dm
Removed turf_animation for now, ported vg hasproximity optimisation. Rewrite and refactor of how turfs handle icon updates, edge smoothing and
2015-08-16 06:05:21 -07:00
mob_grab.dm
Gluttonous var changes.
2015-08-22 03:33:18 +09:30
mob_helpers.dm
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-08-18 18:05:16 +02:00
mob_movement.dm
Merge branch 'dev' into ofClicksAndCooldowns
2015-08-21 16:15:07 +03:00
mob_transformation_simple.dm
…
mob.dm
Merge branch 'dev' into ofClicksAndCooldowns
2015-08-21 16:15:07 +03:00
say.dm
…
transform_procs.dm
Base Life-addition()
2015-06-13 13:36:08 +02:00
typing_indicator.dm
Fixes corpses and unconscious people still showing typing indicators.
2015-05-30 03:13:45 +03:00
update_icons.dm
Fixes #9326
2015-07-26 14:57:49 -04:00