cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,775 Commits 8 Branches 0 Tags
b356f5cf216aa33e9353d2b99dfa5d0c1b9b1f64
Commit Graph

359 Commits

Author SHA1 Message Date
PsiOmegaDelta
5b03184e9c Merge pull request #7491 from Mloc/bs12-sleepyedges 
atmos changes; sleepy edges and hardy rwalls
 2014-12-22 20:04:08 +01:00
Mloc-Argent
cf15517f8a fix up airless turfs to be actually airless 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-12-21 20:36:11 +00:00
Amunak
417fe41248 Mining items path formatting 2014-12-18 04:58:40 +01:00
Atlantiscze
3815ac146f Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into pewPEWPEWboom 
Attempt to resolve merge conflict.
 2014-12-07 04:33:46 +01:00
PsiOmegaDelta
4582c0038b Merge pull request #7205 from Mloc/bs12-setdir 
refactor 'dir = ' into 'set_dir()'
 2014-12-02 14:38:31 +01:00
Mloc-Argent
117ca6a135 refactor 'dir = ' into 'set_dir()' 
This should have little/no gameplay effect right now, just paving the
 way for directional lights.
Replaced handle_rotation() on buckly things with this.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-12-01 13:44:02 +00:00
Atlantiscze
64f9a502f9 Mining robot module upgrade 
- Mining cyborgs can now properly work with drills.
- Mining cyborgs have received ore scanner, crowbar, and limited version of magnetic gripper.
- Mining cyborgs can now swap power cells inside mining drills, as well as upgrade them if provided better parts.
- As a bonus, cyborgs can now see how much ore is in ore boxes (because it makes sense that cyborg which mined ton of ore can check how much ore it mined)
 2014-12-01 05:11:35 +01:00
Atlantiscze
682164335a EMITTER MINING! 
Yes! You can now mine using emitters. Each rock takes 3 blasts to break. This method will also yield less ore than other conventional methods. But using big lasers for mining is cool, right? Who cares about productivity.
 2014-11-29 22:54:16 +01:00
Chinsky
4230a20c45 Merge pull request #6963 from mwerezak/sliceable 
Rewrites food slicing, energy weapons
 2014-11-08 11:07:34 +03:00
mwerezak
81f8f36874 Makes items used to slice food have the edge flag set, cleans up energy weapons, and adjusts slicable w_class. 2014-11-06 19:50:40 -05:00
PsiOmega
bc438e21ad All the relevant examine changes. 2014-11-05 12:44:23 +01:00
Chinsky
3839644bd8 Merge pull request #6651 from PsiOmegaDelta/PowerTwo 
Ports /tg/'s cable and powernet code
 2014-10-26 23:54:31 +03:00
PsiOmega
8e3861141c Merge branch 'dev' into PowerTwo 
Conflicts:
	code/modules/power/solar.dm
 2014-10-24 13:32:36 +02:00
Graham Lloyd
6eb19deef3 incorporates Zuhayr's suggestion 2014-10-22 23:21:01 -04:00
Graham Lloyd
6ff6abf7b4 adds an ex_act to ore boxes. Explosions no longer del all the ore in a box 2014-10-22 16:58:44 -04:00
Zuhayr
ca13d1d5d8 Fixes chem splicing, bioluminescence and seed packets for xenobotany. 2014-10-15 10:05:50 +10:30
PsiOmega
a1ee4e766b Basically ripped over /tg/'s powernet and cable code into our own codebase. 
Keeps Z-level code as it was.
Modifies/restores powernet procs as necessary to match our own implementation changes.
 2014-10-13 17:13:04 +02:00
Zuhayr
0c83a95b90 Large merge resultion. Used remote for map conflicts. 2014-09-23 21:41:54 +09:30
Zuhayr
c4e3c653cf Fixes #6436 2014-09-18 13:12:36 +09:30
Zuhayr
1eb759447e Merge resolution, using dev-freeze map due to unreconcilable conflicts. 2014-09-13 16:54:48 +09:30
Mloc-Argent
712e209ab6 Merge remote-tracking branch 'upstream/master' into dev 
Conflicts:
	code/__HELPERS/text.dm
	code/game/machinery/podmen.dm
	code/game/machinery/vending.dm
	code/game/objects/items/candle.dm
	code/game/objects/items/devices/PDA/cart.dm
	code/modules/clothing/suits/jobs.dm
 2014-09-10 22:14:37 +01:00
Zuhayr
6d21c3193f Trying to add to previous. 2014-09-10 21:16:06 +09:30
Zuhayr
210930b2bb Fixes most of #6300 2014-09-10 20:53:57 +09:30
Kelenius
505f857eb8 Stack update 2014-09-02 09:59:32 +04:00
Zuhayr
58a750398e Fixes 5866# 2014-09-01 23:20:46 +09:30
Whitellama
f5c9586153 Fixed matches and candles not being able to burn papers. Also made Diona join prompt appear for a bit longer. 2014-08-31 02:12:04 -07:00
Kelenius
a1348faa8c Cables are now stacks 2014-08-25 18:54:35 +04:00
Chinsky
f71e43d06c Moved ambiance sounds out of horrendous ifchain to area definitions. 
Changed ambiance spamcheck to use time instead of 10 minute spawn.
 2014-08-16 04:40:46 +04:00
Zuhayr
649af28c77 Fixed the overlay issue for now. This will need replacing. 2014-08-13 12:04:51 +09:30
Zuhayr
54ec5f0233 Attempting to fix a very weird overlay error, refactoring some shit mining code. 2014-08-11 11:42:16 +09:30
Zuhayr
e298b177db Added flags for Mining and Xenoarch. 2014-08-01 22:40:48 +09:30
Zuhayr
4ef8a08310 Added portable_atmospherics to hydroponics machine path, couple of other tweaks. 2014-07-27 03:20:16 +09:30
Zuhayr
196fd07384 Resprited the majority of mining ores and turfs, added coal and plat to surface mining, add falloff for edges of asteroid. 2014-07-20 16:29:18 +09:30
Zuhayr
bc2f91b4e4 Fixes #5608 2014-07-14 12:02:48 +09:30
Zuhayr
5f8723352d Merging robot_modules.dm and master controller setup. 2014-07-14 09:10:02 +09:30
Zuhayr
85b1bbe041 Merging work into dev. 2014-07-10 20:25:07 +09:30
Zuhayr
d5784c653c Reapplied scanners to map, stopped braces working on drill turfs with no resources. 2014-07-10 20:13:59 +09:30
Zuhayr
5ace6d3bc0 Mining rework. Added ore scanner, adjusted values for spawn, added debug verbs. 2014-07-09 19:12:32 +09:30
Zuhayr
b690f927ba Fixes #5472 2014-07-03 05:20:29 +09:30
Zuhayr
19bb5014a9 More work on custom gear. 2014-06-29 04:22:09 +09:30
Zuhayr
9638349fe2 Update distribution.dm 2014-06-25 16:48:20 +09:30
Zuhayr
89a450c4f4 Mining tweaks, removal of debug/cruft, balancing of values. 2014-06-25 16:25:15 +09:30
Mloc-Argent
dd7f0dac0e Merge remote-tracking branch 'upstream/master' into dev 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/computer/card.dm
	code/modules/mob/living/say.dm
 2014-06-20 22:02:40 +01:00
Chinsky
f7e14c8f99 Merge pull request #5282 from Jarcolr/master 
Partially fixes #5255 and walking over asteroid edges
 2014-06-19 17:03:06 +04:00
Cael Aislinn
0e1c367012 reconstitutor has a chance to extract multiple genomes per fossil (50% for two genomes, 37.5% chance for three genomes), moved xenoarchaeology initialisation code into the master controller, added upper and lower spawn vals for digsite turf number and artifact machine number, added circuitboards for the reconstitutors, fixes missing clonepod for flora reconstitutors 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2014-06-19 11:06:20 +10:00
Cael Aislinn
6c46ceaf6d Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenoarchaeology 
Conflicts:
	icons/obj/hydroponics.dmi

manual merge of conflicted icon file

Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2014-06-19 10:05:27 +10:00
Jarcolr
fc4c918eda Fixes #5255 and walking over edges 
Before walking over an asteroid edge would have put the mob under the
sprite, as if the mob crawled under it.
 2014-06-17 20:09:19 +03:00
Chinsky
be95e54e43 Merge branch 'master' into dev 
Conflicts:
	code/defines/obj/weapon.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/living/silicon/say.dm
	icons/mob/uniform.dmi
	maps/tgstation2.dmm
 2014-06-17 16:16:44 +04:00
mwerezak
6dee9cf65d Adds sharp and edge flags to appropriate items 
Went through as many /obj/item/weapons as I could find and added sharp
and edge flags where appropriate.
 2014-06-16 13:26:44 -04:00
Zuhayr
c841db56b6 Merge branch 'mining' of https://github.com/Zuhayr/Baystation12 into dev 2014-06-11 09:24:28 +09:30