cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,610 Commits 6 Branches 0 Tags
1b7f8d7be2f17cf812bd60e4080ed960cf398e2b
Commit Graph

1152 Commits

Author SHA1 Message Date
PsiOmegaDelta
55bc41241f Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/setup.dm
 2015-08-17 09:37:49 +02:00
PsiOmegaDelta
3f1a974ac8 Updates changelog. 2015-08-17 09:31:33 +02:00
PsiOmega
fc40dc5793 Changelog entry. 2015-08-15 22:15:24 +02:00
PsiOmega
ba240cb768 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/antagonist/station/rogue_ai.dm
	code/game/machinery/atmoalter/portable_atmospherics.dm
	code/game/machinery/spaceheater.dm
	code/modules/clothing/head/soft_caps.dm
	maps/exodus-5.dmm
 2015-08-12 21:18:18 +02:00
PsiOmega
59f855b52d Updates the changelog. 2015-08-11 19:55:25 +02: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
mwerezak
bc1c062c83 Merge pull request #10486 from Karolis2011/wikilinkfix 
Updated old wiki links to a new ones.
 2015-08-11 12:42:24 -04:00
Karolis2011
cc029828bb Updated old wiki link to a new one. 2015-08-11 17:20:55 +03:00
PsiOmegaDelta
56382e8806 Changelog entry. 2015-08-11 09:37:38 +02:00
PsiOmegaDelta
c28b3721b4 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/_helpers/unsorted.dm
	code/modules/clothing/glasses/glasses.dm
	code/modules/mob/living/carbon/human/life.dm
	code/setup.dm
 2015-07-31 10:00:16 +02:00
PsiOmegaDelta
2a9194b807 Updates changelog. 2015-07-31 09:48:42 +02:00
PsiOmegaDelta
93e914f021 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/setup.dm
 2015-07-30 10:49:37 +02:00
Chinsky
b9d8cdaee1 Merge pull request #10337 from mwerezak/turret-aiming 
Fixes #10258
 2015-07-29 16:18:42 +03:00
PsiOmegaDelta
f49d8d5e54 Merge pull request #10352 from Baystation12/dev-freeze 
Dev freeze
 2015-07-29 12:16:23 +02:00
PsiOmega
ee69db6ae9 Updates changelog. 2015-07-29 11:57:55 +02:00
Karolis2011
aa899b8321 Added changelog for #9673 and #9308. 2015-07-29 10:20:29 +03:00
mwerezak
6df770cab3 Fixes projectiles being able to hit humans in organs they do not have. 
Will also prevent body shields blocking bullets with non-existant limbs. Expands on the special return values for bullet_act(), adds defines for them.
 2015-07-28 20:23:26 -04:00
PsiOmegaDelta
5cbb703609 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/_helpers/unsorted.dm
	code/game/jobs/access.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/update_icons.dm
	code/modules/organs/organ.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/setup.dm
 2015-07-27 10:20:20 +02:00
PsiOmegaDelta
ade491b326 Changelog update. 2015-07-27 09:53:35 +02:00
PsiOmegaDelta
f3c9a7224b Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/objects/items/weapons/storage/storage.dm
	code/modules/reagents/reagent_containers/borghydro.dm
 2015-07-24 10:53:57 +02:00
Chinsky
90ae24dd1c Merge pull request #10135 from Kelenius/ofBorgsAndShakers 
Of borgs and shakers
 2015-07-23 21:41:48 +03:00
PsiOmegaDelta
34fdc4712e Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/_helpers/names.dm
	code/game/jobs/job/silicon.dm
	code/game/objects/items.dm
	code/modules/mining/abandonedcrates.dm
	code/modules/mob/living/carbon/brain/life.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/simple_animal/friendly/spiderbot.dm
	code/modules/nano/modules/alarm_monitor.dm
	code/setup.dm
 2015-07-14 08:21:12 +02:00
PsiOmegaDelta
67399dcf63 Updates changelog. 2015-07-14 08:12:29 +02:00
PsiOmegaDelta
8da7141af1 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mining/abandonedcrates.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
 2015-07-14 08:11:11 +02:00
mwerezak
0fc12eb22b Fixes #9927 
Fixes issues with deca code crates.
 2015-07-13 00:45:36 -04:00
Kelenius
79804f663e Updates borg shaker and hypospray 
Fixes #6937
Hypospray no longer contains a bunch of reagent holders
 2015-07-12 19:50:02 +03:00
PsiOmegaDelta
c6f4f7fcee Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-07-12 15:14:43 +02:00
PsiOmegaDelta
e6749b879d Adds changelog entry. 2015-07-12 14:37:39 +02:00
PsiOmegaDelta
aa1b0ef911 Changelog entry. 2015-07-11 11:13:01 +02:00
PsiOmegaDelta
9b4d09c974 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/_helpers/unsorted.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/grenades/emgrenade.dm
	code/modules/clothing/spacesuits/rig/rig_attackby.dm
 2015-07-11 10:58:49 +02:00
PsiOmegaDelta
47ced1df13 Changelog update. 2015-07-11 09:51:58 +02:00
Chinsky
9d2ffa3ffb Merge pull request #10087 from Loganbacca/turretfixes 
Fixes - turrets and cargo trains
 2015-07-11 08:33:04 +03:00
GinjaNinja32
c24f8f3452 Merge pull request #10088 from mwerezak/inhand-overlays2 
Ports grenade and flash in-hand sprites
 2015-07-10 21:12:11 +01:00
Zuhayr
58c3da3970 Merge pull request #10093 from PsiOmegaDelta/dev-freeze 
Dev freeze
 2015-07-11 03:43:59 +09:30
mwerezak
f023069ab2 Changelog 2015-07-10 11:00:33 -04:00
Loganbacca
c04fc312e2 Moved trajectory check to during target assessment 2015-07-11 02:47:47 +12:00
Loganbacca
f30fa4b4be Changelog 2015-07-11 02:16:17 +12:00
Loganbacca
ce77c61028 Projectile visual bug fixes 
- Fixed visible beam projectile
- Fixed additional tracers overlaying impact effects
 2015-07-11 00:06:44 +12:00
PsiOmegaDelta
dd231d4f2e Changelog update. 2015-07-10 12:58:05 +02:00
Zuhayr
946c445b29 Fixes #9896 2015-07-10 01:14:12 +09:30
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
a775bf1cfc Changelog update. 2015-07-06 17:32:03 +02:00
PsiOmegaDelta
8f24ad03d2 Merge pull request #10019 from GinjaNinja32/provisional 
Adds 'Provisional' to the list of acting rank prefixes
 2015-07-05 22:26:15 +02:00
GinjaNinja32
06063d5396 Changelog. 2015-07-05 12:40:17 +01:00
PsiOmega
5518c60daf Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-07-04 15:33:48 +02:00
PsiOmega
36fe66653d Changelog update. 2015-07-04 15:20:11 +02:00
Zuhayr
9a7515af8f Merge with dev-freeze. 2015-07-02 19:04:01 +09:30
PsiOmegaDelta
49e7f1830a Changelog entry. 2015-06-30 15:51:36 +02:00
PsiOmegaDelta
f420dd9f01 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	.travis.yml
	code/modules/mob/living/carbon/brain/life.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/living_defines.dm
	code/modules/mob/living/silicon/silicon.dm
	code/setup.dm
 2015-06-30 08:59:34 +02:00
PsiOmegaDelta
7d69af1b0d Changelog update. 2015-06-30 08:36:20 +02:00