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

3398 Commits

Author SHA1 Message Date
PsiOmegaDelta
cacf6cb2ad Fixes Crescent map conflicts. 2015-06-30 08:30:02 +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
b0ff071c66 Enforces Crescent area restrictions. 
Installs several blast door, controlled by the central Crescent checkpoint, to enforce access restriction to the Thunderdome, shuttle, and post-security check areas.
 2015-06-27 19:03:18 +02:00
PsiOmegaDelta
203f1b321a Fixes missing camera c_tag. 
Prevents the camera from showing up as an invalid null entry in the camera console list.
 2015-06-25 10:11:25 +02:00
Zuhayr
e18966cbf6 Fixes #9887 2015-06-22 22:03:40 +09:30
PsiOmegaDelta
7cac6b57b9 Restores the missing vault camera. 
Fixes #9842.
 2015-06-17 11:03:53 +02:00
mwerezak
3715fafae3 Makes certain brig counters steel, fixes missing HOP office tables, changes CMO office tables to glass. 2015-06-16 19:17:30 -04:00
mwerezak
f2f05a0336 Tables on other zlevels 2015-06-14 15:22:22 -04:00
mwerezak
dec1461f6c Fixes chair preview icon 2015-06-14 14:55:04 -04:00
mwerezak
45772952d2 Fixes engineering stacks having only 1 sheet, adds more plastic 
Workshop now starts with 3x50 steel sheets, 3x50 glass sheets, 2x50
plastic sheets, and 3x10 plasteel sheets.
 2015-06-14 14:45:11 -04:00
mwerezak
921d68f353 Glass tables, padded stools 
Adds glass tables to chemistry, virology, and HOP's office. Replaces
stools with padded stools in various places around medbay and research
 2015-06-14 14:21:55 -04:00
mwerezak
0d6dfd899a Makes standard tables plastic 
Makes standard tables plastic, readds steel tables to various places,
mainly around engineering and maintenance. Makes shuttle tables
reinforced.
 2015-06-14 13:38:56 -04:00
Atlantis
41d4c2eb13 Refactors /obj/item/apc_frame to /obj/item/frame/apc 
- This fixes broken APC frame placement on walls - #9537
 2015-06-07 06:26:10 +02:00
Chinsky
ff592c751a Merge pull request #9483 from PsiOmegaDelta/150526-EndGameTweaks 
End game tweaks
 2015-05-31 23:55:08 +03:00
Chinsky
10218eb8c9 Merge pull request #9573 from Zuhayr/chairs 
Chair update.
 2015-05-31 11:33:24 +03:00
PsiOmegaDelta
cc137738ad Merge pull request #9590 from Zuhayr/dev-freeze 
Fixes
 2015-05-30 23:20:49 +02:00
PsiOmega
9148d593e2 Fixes #9592. 
Re-adds phoron stacks:
1x25 sheets in the engineering storage.
1x5 sheets in xenobiology.
6x1 sheets in chemistry.

Re-adds reinforced glass stacks.
1x1 in locker room maintenance.
 2015-05-30 21:23:35 +02:00
Zuhayr
b3102824a0 Fixes #9544 2015-05-31 03:56:06 +09:30
PsiOmega
bf27545841 End game turf changes now simply alters color. 2015-05-29 23:38:09 +02:00
Zuhayr
3cf0018fb8 Fixing up bed icons etc. 2015-05-30 01:13:11 +09:30
PsiOmega
228000d9cc Marks the engine room, AI, and asteroid shuttle APCs as critical. 2015-05-26 13:26:42 +02:00
mwerezak
02dafb3c71 Adds a bunch of traps to the skipjack equipment 2015-05-24 16:44:35 -04:00
PsiOmega
a294ce9128 Adds additional missing materials: 
EVA again has:
3x50 sheets of steel.
1x10 sheets of plasteel
1x50 sheets of glass
1x50 sheets of reinforced glass.

Robotics again has:
5x50 sheets of metal.
1x20 sheets of glass.
1x10 sheets of plasteel.

Cargo again has:
1x50 sheets of metal.
1x50 sheets of glass.
 2015-05-23 12:49:58 +02:00
PsiOmega
3837e67f70 Fixes #9054. 
Seeing how xenobiology is separated from the rest of the station, the Research disposal unit now leaves its goods in the main research hallway.
 2015-05-22 11:40:57 +02:00
PsiOmega
38fbe15f5a Fixes #9265. 
Now either engineering or atmos techs can utilize the windoors.
 2015-05-22 09:47:52 +02:00
PsiOmega
3d12ad3ab0 Fixes #9359. 
While I'm at it.
 2015-05-22 09:44:27 +02:00
PsiOmega
e9abad5c70 Restores missing materiel in engineering. 
The engineering workshop now again contains:
3 sheets of steel, 50 units ea.
3 sheets of glass, 50 units ea.
3 sheets of plasteel, 10 units ea.
1 sheet of plastic, 20 units.
 2015-05-22 09:41:07 +02:00
Zuhayr
93b014c699 Merge with dev. 2015-05-20 13:39:31 +09:30
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
Zuhayr
8ce787ef68 Final tweaks to recipe availability and material inheritance. 2015-05-17 18:22:21 +09:30
Zuhayr
a540e97e1b Stool and table tweaks, adjusted tables on the map. 2015-05-17 13:41:22 +09:30
Zuhayr
4cd2a5a532 Updating stools/stool padding. 2015-05-17 12:53:23 +09:30
Zuhayr
ae3ad84634 Updated ashtrays and mineral doors. 2015-05-17 03:02:03 +09:30
Zuhayr
8f6666a32e Converted barricades to material system. 2015-05-17 02:01:20 +09:30
Zuhayr
358867f3b5 Major sheet and material refactor. 2015-05-17 01:46:53 +09:30
Zuhayr
a101855343 Converted over hatchets and scythes. 2015-05-17 00:15:46 +09:30
Zuhayr
83570a1a9e Merge branch 'materials' of https://github.com/Zuhayr/Baystation12 into dev 2015-05-16 23:35:05 +09:30
Zuhayr
150b24023e Renamed kitchen utensils. 2015-05-16 21:24:36 +09:30
Zuhayr
a32179a062 Renamed knives. 2015-05-16 20:54:34 +09:30
Zuhayr
8aa24b86bb Renamed shards, katanas, claymores. 2015-05-16 20:36:33 +09:30
Zuhayr
e1a14e3c41 Removes xenoarch reconstitutors entirely. "Fixes" #5413 2015-05-16 17:40:49 +09:30
GinjaNinja32
76654321e4 Merge remote-tracking branch 'upstream/dev' into new_tables 
Conflicts:
	code/setup.dm
 2015-05-16 08:53:33 +01:00
PsiOmegaDelta
38eb1ad7b9 Merge pull request #9263 from Hubblenaut/dev 
Cleans up access and map artifacts
 2015-05-16 09:33:11 +02:00
Hubblenaut
f9cbf1a1fd Cleans up access and map artifacts 2015-05-15 15:36:48 +02:00
Kelenius
10915eae24 Merge branch 'dev' into ofChemistryAndStuff 
Conflicts:
	code/game/objects/effects/chem/chemsmoke.dm
	code/modules/customitems/item_defines.dm
	code/modules/projectiles/guns/launcher/syringe_gun.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
	code/modules/reagents/reagent_containers/food/drinks.dm
	code/modules/reagents/reagent_containers/pill.dm
	maps/exodus-1.dmm
 2015-05-15 11:28:05 +03:00
Atlantiscze
17bfbd911b Fixes missing cable near mining outpost 2015-05-15 01:39:24 +02:00
GinjaNinja32
21394e78c4 Merge remote-tracking branch 'upstream/dev' into new_tables 2015-05-15 00:12:40 +01:00
Chinsky
8d83e8d452 Merge pull request #9202 from Zuhayr/customitems 
Custom items refactor.
 2015-05-14 21:47:04 +03:00
Chinsky
a4285a0c72 Merge pull request #9243 from PsiOmegaDelta/Mapping 
Fixes pipes on the asteroid disappearing into limbo.
 2015-05-14 20:43:08 +03:00
PsiOmega
be02c74508 Makes use of the new pre-definer atmospheric tank vents on the engineering outpost. 2015-05-14 15:32:01 +02:00