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
25,548 Commits 5 Branches 0 Tags
aa1b0ef9110f2ace7aa9d4cd9f86cdf6ea24cadc
Commit Graph

1055 Commits

Author SHA1 Message Date
PsiOmegaDelta
aa1b0ef911 Changelog entry. 2015-07-11 11:13:01 +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
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
36fe66653d Changelog update. 2015-07-04 15:20:11 +02:00
PsiOmegaDelta
49e7f1830a Changelog entry. 2015-06-30 15:51:36 +02:00
PsiOmegaDelta
7d69af1b0d Changelog update. 2015-06-30 08:36:20 +02:00
PsiOmegaDelta
cf10dc38b1 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	.travis.yml
	code/game/atoms.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/mob/living/silicon/silicon.dm
 2015-06-30 08:24:43 +02:00
PsiOmega
6c8d5903e5 Changelog entries. 2015-06-27 19:05:37 +02:00
PsiOmega
dd7d9b851b Updates changelog. 2015-06-26 19:23:47 +02:00
PsiOmega
0e471be0e6 Updates changelog. 2015-06-24 17:31:07 +02:00
mwerezak
649c59cbc6 Updates changelog 2015-06-22 23:34:22 -04:00
PsiOmegaDelta
839b26f927 Changelog entry. 2015-06-19 09:56:16 +02:00
mwerezak
a4c2b63975 Updates changelog 2015-06-16 16:26:00 -04:00
PsiOmegaDelta
cb7fb3aea9 Changelog update. 2015-06-05 10:23:44 +02:00
PsiOmegaDelta
7f9996eece Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-06-05 10:23:23 +02:00
PsiOmegaDelta
6aaacd6063 Changelog entry. 2015-06-04 13:27:44 +02:00
PsiOmegaDelta
094ba6a1fc Changelog update. 2015-06-04 08:11:44 +02:00
PsiOmegaDelta
6c903907c0 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-06-04 08:10:49 +02:00
Zuhayr
da3ee37df9 Merge pull request #9638 from PsiOmegaDelta/150602-LawSets 
Allows all synths to view the alternative law sets.
 2015-06-03 04:00:11 +09:30
PsiOmegaDelta
d2cfcdf9d9 Changelog entry. 2015-06-02 15:59:57 +02:00
PsiOmegaDelta
9f76386a7a Changelog entry- 2015-06-02 15:42:22 +02:00
PsiOmegaDelta
971308f42b Changelog entry. 2015-06-02 13:41:56 +02:00
PsiOmegaDelta
4d9c4ee9ba Updates changelog. 2015-06-02 13:15:38 +02:00
PsiOmegaDelta
4a976e1ee2 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-06-02 13:13:40 +02:00
Yoshax
63f253a301 Makes hyposprays start empty 2015-06-01 17:17:16 +01:00
Techhead0
0f0fcf2d46 Re-adds extended oxygen tanks to relevant jobs. 2015-05-31 14:08:46 -04:00
PsiOmega
a625b1db33 Changelog update. 2015-05-30 16:00:19 +02:00
PsiOmega
5e84bfa57c Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/clothing/spacesuits/rig/suits/ert.dm
 2015-05-30 15:59:54 +02:00
PsiOmega
1ac24d47ad Changelog entry. 2015-05-29 08:27:01 +02:00
Atlantis
7981777c41 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into newmalf-merge 2015-05-28 20:16:12 +02:00
PsiOmegaDelta
414a4321fd Merge pull request #9496 from mwerezak/ivstand 
IV stands are no longer bullet shields
 2015-05-27 19:57:40 +02:00
PsiOmega
2e7b737f7a Updates changelog. 2015-05-27 17:13:10 +02:00
mwerezak
e510f6625f Fixes IV stands blocking bullets 
IV stands now check PASSTABLE, allowing projectiles and small mobs to
pass through them.

Flipped tables now block small mobs.
 2015-05-26 23:05:38 -04:00
mwerezak
d65ec62dcb Fixes #9493 2015-05-26 22:49:16 -04:00
PsiOmega
5c1d847b0a Changelog entry. 2015-05-26 16:49:27 +02:00
PsiOmega
c417955cb9 Changelog entry. 2015-05-26 09:04:36 +02:00
Atlantis
97f0470504 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into newmalf-merge 2015-05-22 21:01:26 +02:00
PsiOmega
51231538ed Changelog update. 2015-05-22 08:27:42 +02:00
Chinsky
53e3e2f6e6 Merge pull request #9379 from Zuhayr/materials 
Materials + Morguemeat icon + bat nerf
 2015-05-21 03:23:41 +03:00