cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-27 01:33:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,136 Commits 8 Branches 0 Tags
fb6b94de8773e6855b362faf84ef8e0f427e608f
Commit Graph

1232 Commits

Author SHA1 Message Date
Zuhayr
9087466552 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into randmap 2015-08-25 12:29:59 +09:30
PsiOmegaDelta
3de6d1b19c Merge pull request #10381 from Zuhayr/hardsuitcontrol 
Rig AI movement and module control buffs.
 2015-08-24 12:04:31 +02:00
PsiOmegaDelta
c040d4b951 Updates changelog. 2015-08-24 10:32:30 +02:00
PsiOmegaDelta
9057655da6 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/clothing/clothing.dm
	code/modules/clothing/spacesuits/spacesuits.dm
	code/modules/clothing/spacesuits/void/merc.dm
	code/modules/clothing/spacesuits/void/void.dm
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/mob/living/silicon/ai/ai.dm
 2015-08-24 10:31:30 +02:00
PsiOmegaDelta
c376c08cc0 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/structures/girders.dm
	code/modules/mob/living/carbon/human/human_damage.dm
 2015-08-24 10:23:12 +02:00
PsiOmegaDelta
2e09278a7e Updates changelog. 2015-08-24 10:16:56 +02:00
Zuhayr
23564bda0c Merge pull request #10694 from PsiOmegaDelta/150817-SynthAccess 
Synths now relies on access permissions as well.
 2015-08-24 17:45:10 +09:30
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
Zuhayr
9cbacd6653 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hardsuitcontrol 
Conflicts:
	code/_onclick/click.dm
 2015-08-23 02:24:34 +09:30
GinjaNinja32
222049dd3c Merge pull request #10791 from Zuhayr/speciestweaks 
Species tweaks
 2015-08-22 17:50:43 +01:00
GinjaNinja32
2341d2afa9 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-22 15:44:02 +01:00
GinjaNinja32
4e56b82ec0 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-08-22 15:28:49 +01:00
mwerezak
cfa8ab3fd0 Removes bear traps from the custodial closet, adds autolathe recipe 2015-08-22 02:31:19 -04:00
Zuhayr
b702c81060 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into randmap 
Conflicts:
	code/game/turfs/simulated/floor_types.dm
 2015-08-22 03:57:12 +09:30
Zuhayr
ca185ff18e Changelog 2015-08-22 03:36:19 +09:30
Zuhayr
56131e1053 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into devupdate 
Conflicts:
	code/modules/clothing/clothing.dm
 2015-08-22 03:17:16 +09:30
Zuhayr
3c477dfa5e Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/game/jobs/access.dm
	code/modules/mob/living/carbon/brain/brain_item.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/organs/organ_icon.dm
 2015-08-22 03:11:53 +09:30
Zuhayr
f752813132 Changelog. 2015-08-22 02:57:13 +09:30
Zuhayr
a00ac82221 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hardsuitcontrol 
Conflicts:
	code/_onclick/rig.dm
 2015-08-22 02:36:05 +09:30
Zuhayr
bf313ae238 Merge pull request #9851 from mwerezak/armourpen 
Adds armor penetration system
 2015-08-22 02:22:17 +09:30
Zuhayr
55c1331261 Merge pull request #10004 from PsiOmegaDelta/150703-AISight 
Active AI cores now provides camera coverage.
 2015-08-22 02:21:36 +09:30
Zuhayr
6c27a8dd8d Merge pull request #9159 from Kelenius/ofClicksAndCooldowns 
Removes click cooldowns almost everywhere.
 2015-08-22 01:51:05 +09:30
Zuhayr
b4b7719557 Merge pull request #9888 from Vivalas/dev 
[DEV] Re-adds the new uplink item
 2015-08-22 01:34:01 +09:30
Kelenius
bed03443d1 Merge branch 'dev' into ofClicksAndCooldowns 
Conflicts:
	code/ZAS/Airflow.dm
	code/__defines/items_clothing.dm
 2015-08-21 16:15:07 +03:00
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
Chinsky
b2e9a7c2a6 Merge pull request #9942 from RavingManiac/dev 
Sound environment revamp
 2015-08-20 19:47:09 +03:00
PsiOmegaDelta
af008b03f8 Changelog entries. 2015-08-20 14:06:27 +02:00
Zuhayr
c8b6813426 Merge pull request #10005 from PsiOmegaDelta/150703-Uplinkery 
Uplink Items - Part III
 2015-08-20 19:19:12 +09:30
Zuhayr
a8dc3a282b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into turfs 2015-08-18 12:06:53 -07:00
mwerezak
ddeb384a68 Merge pull request #10695 from PsiOmegaDelta/150817-48by48 
Adds 48x48 option to Icons dropdown menu
 2015-08-17 13:22:41 -04:00
PsiOmegaDelta
673664efd6 Changelog entry. 2015-08-17 13:23:59 +02:00
PsiOmegaDelta
332f227444 Changelog entry. 2015-08-17 11:06:21 +02:00
PsiOmegaDelta
a0b2b8b28e Updates changelog. 2015-08-17 09:44:54 +02:00
PsiOmegaDelta
74b8f6c3be Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	html/changelogs/.all_changelog.yml
 2015-08-17 09:44:21 +02:00
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
Zuhayr
ac261213e9 Rewrites the floor painter. 2015-08-16 20:58:54 -07:00
Zuhayr
e58dfe9a71 Changelog. 2015-08-16 19:28:51 -07:00
PsiOmega
f90a4a0cd7 Updates changelog. 2015-08-16 10:32:25 +02:00
PsiOmega
fc40dc5793 Changelog entry. 2015-08-15 22:15:24 +02:00
Chinsky
7241c2f2d1 Merge pull request #9947 from mwerezak/breacher 
Makes unathi breachers fit unathi only
 2015-08-15 22:04:36 +03:00
PsiOmega
0c0a521003 Changelog entry. 2015-08-15 15:25:51 +02:00
PsiOmega
3df027324d Changelog update. 2015-08-15 11:16:52 +02:00
HarpyEagle
6404d02c38 Adds changelog and tweaks PTR penetration. 2015-08-15 02:19:23 -04:00
Chinsky
617c001a62 Merge pull request #10350 from Kelenius/ofSleepersAndNano 
Of sleepers and nano
 2015-08-14 18:26:50 +03:00
Kelenius
aa318b8d1c Merge branch 'dev' into ofBeesAndHoney 
Conflicts:
	code/modules/materials/material_recipes.dm
 2015-08-14 16:55:21 +03:00
Kelenius
18358936ee Merge branch 'dev' into ofSleepersAndNano 
Conflicts:
	maps/exodus-1.dmm
	maps/exodus-2.dmm
	maps/exodus-5.dmm
 2015-08-14 16:50:44 +03:00
PsiOmegaDelta
0802abc67a Updates changelog. 2015-08-14 08:44:03 +02:00
Chinsky
54cb084113 Merge pull request #9997 from PsiOmegaDelta/150702-MoneyMoneyMoney 
Economic strength now depends on race and job.
 2015-08-14 03:56:57 +03:00