cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,427 Commits 10 Branches 0 Tags
5b13445e9540532000aed2bc925014d3173fce35
Commit Graph

269 Commits

Author SHA1 Message Date
Aranclanos
7312807346 Reverting the comment out on the sprites and added the correct path, the xenoarcheology.dmi 2013-05-05 21:21:09 -03:00
Aranclanos
d762024d68 Fixed the server crash, it was an infinite loop when a revolver spawned in the xenoarcheology. It added bullets (tried, because it didn't work either) over and over nonstop. 
Commented out the sprite selection on the revolvers in the xenoarcheology spawn code, it selected wrong names and they ended up being invisible. Now they will have the default sprite, the black revolver.
 2013-05-05 21:12:15 -03:00
Spamcat
e4763aa928 Fixed #2708. 2013-04-27 13:49:44 +04:00
SkyMarshal
bd0d988b23 Fix for Xenoarch machines producing ludicrous amounts of heat. 
Defines may need tweaked to produce the desired effect.
 2013-04-19 12:40:30 -07:00
Cael_Aislinn
2e0370ba65 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	code/modules/research/xenoarchaeology/misc.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-04-02 21:14:13 +10:00
Cael_Aislinn
964525450d only hoverpods should make hissing noises when they move now 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-04-02 20:16:47 +10:00
Cael_Aislinn
14bbdc91ca cleaned up artifact/find debris spawning, stopped debris being dropped for every asteroid turf, dropped machinery heat gain by 3/4 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-31 01:29:19 +10:00
Spamcat
76720abd6f Merge branch 'BEF-staging' of github.com:Baystation12/Baystation12 into BEF-staging 2013-03-19 11:17:32 +04:00
Spamcat
4036ee3732 Fixed dem closets. 2013-03-18 18:37:57 +04:00
Spamcat
5e2c921933 Fixed nanopaste messages. 
(and some my shitcode)
 2013-03-18 18:01:51 +04:00
Cael_Aislinn
cad490c5f1 hand pick can fit into the excavation kit, made the xenoarch tool closet properly retain icon states 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-18 18:51:21 +10:00
Cael_Aislinn
00c915b16a fixed size of 5/6 picks, fixed some of the field types for suspension gens 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-18 11:53:55 +10:00
Cael_Aislinn
e2058e57a4 added a new manual explaining suspension, tweaked a manual 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-18 11:52:07 +10:00
Christian Bielert
14a96f77ab Merge pull request #2539 from comma/organ 
Organ code restructuring
 2013-03-16 07:10:40 -07:00
Cael_Aislinn
435ceda41f Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch 
Conflicts:
	maps/tgstation.2.1.0.0.1.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-15 20:37:35 +10:00
Cael_Aislinn
74d0608278 made research shuttle consoles buildable, removed a debug thing for analysis machines 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-15 20:06:22 +10:00
Cael_Aislinn
1b0c83cb76 renamed a bunch of areas, naming tweaks elsewhere, added some custom mapplaced obj definitions 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-15 20:05:27 +10:00
Cael_Aislinn
d8fbd0b2cc tweaked some names 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-15 01:09:02 +10:00
Cael_Aislinn
3c745a1ee2 added some storage boxes + gearbelt 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-15 01:03:01 +10:00
Cael_Aislinn
bf216021fc added/cleaned up research outpost areas (inc iconstates), moved area definitions to separate file 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-15 01:02:23 +10:00
Chinsky
a2e2c373ef Added new item - nanopaste. 
Researchable by RnD (materials and engineering tech), used to repair robots and robolimbs more efficiently (twice as fast and both damage types at once).
 2013-03-13 05:57:53 +04:00
Cael_Aislinn
a1adddbce2 compile fix 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-11 00:12:33 +10:00
Cael_Aislinn
32184d8419 shuffled some sprites around, cleaned up some vars, added a new sprite for hyperspectral imager based on the book scanner 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-10 23:25:05 +10:00
Cael_Aislinn
4559bcce57 tewaked the noticeboard memos a bit, added 5 (verbose) manuals explaining how to do xenoarchaeology in character, added a bookcase for the manuals 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-10 22:57:08 +10:00
Cael_Aislinn
2401ac8185 more renames 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-10 19:06:29 +10:00
Cael_Aislinn
c79b0c1672 moved and renamed a bunch of files to be more consistent + intuitive 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-10 19:00:05 +10:00
Cael_Aislinn
67ecee35df renamed scanner to be more consistent, fixed a couple of issues with the anodevice local feedback on activate 2013-03-10 18:51:15 +10:00
Cael_Aislinn
2ef841da6e overhaul/cleanup to ano utilizers: they're now consistent with modern ss13 interactions + process more cleanly and operate more robustly, they properly interact with the rest of the updated xenoarch content, activating them should also give a message to anyone watching 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-10 18:43:41 +10:00
Cael_Aislinn
50f4d3a24d harvester overhaul to be cleaner + updated interaction and processing, should properly interact with the rest of the xenoarch update, draining charge is now done incrementally and procs the artifact effect on the harvester/anyone nearby 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-10 18:43:35 +10:00
Cael_Aislinn
ade8fcae22 effects will get a random id if the excavation code doesn't assign them one, cleaned up local activation feedback for effects 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-10 18:33:11 +10:00
Cael_Aislinn
28ab7d4e90 players touching an artifact with gloves will now receive a feedback message 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-10 18:32:06 +10:00
Cael_Aislinn
88c17b75b6 tweaks to artifact analysis including non-sfx vocal feedback, some cleanups to pre-scan checks 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-10 18:31:30 +10:00
Cael_Aislinn
fdcbebab93 tweaks and fixes to a bunch of artifact effects 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-10 18:21:45 +10:00
Cael_Aislinn
46761b14f8 fleshed out artifact analysis, added effect types to all the effects 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-10 14:55:04 +10:00
Cael_Aislinn
e27d7b2aeb cleanup for a bunch of stuff in arty scanners+harvesters, fix compile errors 2013-03-06 21:05:57 +10:00
Cael_Aislinn
dc794f5dac renamed a bunch of files to be a little more visible, added the beginnings of the new artifact scanners 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-06 20:50:17 +10:00
Cael_Aislinn
54fd829781 fixed chemical prep not working (runtime) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-25 15:06:40 +10:00
Cael_Aislinn
46ecf43cf9 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch 
Conflicts:
	baystation12.dme
	code/WorkInProgress/Cael_Aislinn/ShieldGen/energy_field.dm
	icons/obj/device.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-25 14:40:46 +10:00
Cael_Aislinn
9b8387ac05 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into xenoarch 
Conflicts:
	baystation12.dme
	code/modules/reagents/Chemistry-Recipes.dm
	code/modules/research/xenoarchaeology/misc.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-25 14:27:44 +10:00
Cael_Aislinn
743e8f55dd fix for bones spawning weirdly 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-19 02:33:51 +10:00
Cael_Aislinn
7f4e52e299 replaced carrier reagents with existing chemical reagents 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-19 02:31:50 +10:00
Cael_Aislinn
ecb02a3acd reduced output message frequency for artifacts and analysis machinery, tweaked tools + finds, added storage item for excav picks 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-19 02:30:43 +10:00
Cael_Aislinn
040cf2f8d5 tweaked artifact extraction, artifacts 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-19 02:27:46 +10:00
Cael_Aislinn
31bf502e65 moved a file, add/tweaked some sprites 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-19 01:58:42 +10:00
Chinsky
a68e5d3875 Merge pull request #2333 from Baystation12/BEF-staging 
Merge on the 16th if no issues
 2013-02-17 04:44:25 -08:00
Zuhayr
6ad09d49c8 Fixes for posibrain name generation, research design for protolathe, possible for for double-say for posibrains (cannot test locally). 2013-02-16 14:21:00 -08:00
Cael_Aislinn
f0de14d0d4 fixed xenoarch chemical analysis, added icons for excavation picks, various misc tweaks 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-14 21:59:50 +10:00
Cael_Aislinn
7fba00ce55 miscellaneous fixes + tweaks + cleanups (spoons, artifacts, geotracking, helpers for finds, tools / gear) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-14 13:28:31 +10:00
Cael_Aislinn
bbfbfb0ca2 tweaks to artifact spawning, tweaks and fixes to multiple anomalous artifact effects 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-13 12:23:20 +10:00
Cael_Aislinn
b9bd5ca3e2 renamed two files, restructured tools and anomaly suits to semi-final format 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-13 12:22:30 +10:00