cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,392 Commits 8 Branches 0 Tags
0624fced644fb2388c91a54dbe7dfee71df98c18
Commit Graph

1039 Commits

Author SHA1 Message Date
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
Chinsky
9d14bc41de Merge pull request #9389 from mwerezak/fire 
Fire
 2015-05-21 03:13:55 +03:00
Zuhayr
c3f0f42ec2 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into materials 2015-05-21 00:49:14 +09:30
Zuhayr
98def6e247 Updating dev from master. 2015-05-21 00:08:22 +09:30
Zuhayr
93b014c699 Merge with dev. 2015-05-20 13:39:31 +09:30
Atlantis
f0cd799021 Changelog + fluff fix 
- Finally adds changelog entry
- System override message modified according to github discussion.
 2015-05-19 17:28:21 +02:00
Zuhayr
06c04edb5e Merge pull request #9337 from comma/ghettoMD 
Ghetto MDing
 2015-05-19 20:38:50 +09:30
mwerezak
953e8be44e Fire tweak 2015-05-19 00:09:37 -04:00
ccomp5950
43c10d7d60 Changelogs 2015-05-18 18:51:49 -04:00
Chinsky
8e5f5ef8e0 Merge pull request #9165 from Yoshax/trapping 
Makes bear traps do damage when stepped on
 2015-05-19 01:43:05 +03:00
PsiOmega
187e7e869a Changelog update. 2015-05-18 17:51:42 +02:00
Chinsky
33e8791fe9 Merge pull request #9264 from Hubblenaut/airlocks 
Fixes airlock wires
 2015-05-18 18:21:05 +03:00
Chinsky
ec499ac941 Merge pull request #9307 from Kelenius/ofChemAndChangelogs 
Adds chemistry update changelog
 2015-05-18 18:20:46 +03:00
Chinsky
6169c49832 Merge pull request #9143 from Loganbacca/qol_mule 
[QOL] MULE destination selection
 2015-05-18 18:20:17 +03:00
Hubblenaut
86426d0424 Fixes airlock wires and adds backup power light 2015-05-18 16:55:12 +02:00
Chinsky
83803fa069 Changelog 2015-05-18 08:03:02 +03:00
Chinsky
b08fcb8d3e Merge pull request #9297 from PsiOmegaDelta/RandomWireBreaking 
Destroying a camera now also cuts wires randomly.
 2015-05-18 00:40:56 +03:00