cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,196 Commits 9 Branches 0 Tags
d7650f55ea65bc3b3b89b51f564749faee530e23
Commit Graph

1079 Commits

Author SHA1 Message Date
PsiOmegaDelta
2e09278a7e Updates changelog. 2015-08-24 10:16:56 +02:00
Zuhayr
863d75076d Merge pull request #10759 from mwerezak/girders 
Fixes reinforcing girders through windows, adds an SS13-like interface for reinforcing
 2015-08-24 17:28:08 +09:30
mwerezak
cfa8ab3fd0 Removes bear traps from the custodial closet, adds autolathe recipe 2015-08-22 02:31:19 -04:00
Zuhayr
f752813132 Changelog. 2015-08-22 02:57:13 +09:30
mwerezak
8626fbfd39 Removes the reinforce girder verb 2015-08-20 23:50:40 -04:00
mwerezak
db7ba70415 Adds SS13-like interface for reinforcing girders 2015-08-20 23:50:16 -04: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
59f855b52d Updates the changelog. 2015-08-11 19:55:25 +02: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
2a9194b807 Updates changelog. 2015-07-31 09:48:42 +02:00
Chinsky
b9d8cdaee1 Merge pull request #10337 from mwerezak/turret-aiming 
Fixes #10258
 2015-07-29 16:18:42 +03: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
ade491b326 Changelog update. 2015-07-27 09:53:35 +02:00
Chinsky
90ae24dd1c Merge pull request #10135 from Kelenius/ofBorgsAndShakers 
Of borgs and shakers
 2015-07-23 21:41:48 +03: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
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
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