cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,439 Commits 5 Branches 0 Tags
901bfe7c664836f1efa93cd8ed2ccd05e3fb8eb6
Commit Graph

2182 Commits

Author SHA1 Message Date
Zuhayr
342bee81d4 Merge pull request #5284 from boopcat/happydrones 
more fixes!
 2014-06-18 08:58:00 +09:30
Boop
a903e400dd Fixes #5088 
also fixes more runtimes that mloc gave me
 2014-06-17 20:35:48 +01: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
Jarcolr
5d2bba3434 Adds paths for therapy dolls 
http://puu.sh/9xlQu/53016923a6.dmi for the dolls that are already in the
code but unused.
 2014-06-17 14:53:18 +03:00
Chinsky
dd4a937ca9 Merge pull request #5275 from GinjaNinja32/lighters 
Fixes cheap lighters burning body parts other than the hands they're being held in
 2014-06-17 14:43:24 +04:00
Chinsky
1ca6a54d3a Merge pull request #5265 from mwerezak/wound-fixes 
Fixes the wounding system
 2014-06-17 14:41:22 +04:00
GinjaNinja32
fcdd0198c0 Fix lighter burning random body parts 2014-06-17 04:50:14 +01: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
mwerezak
1b33ca943d Separates the sharp flag into edge and sharp 
Now weapons can properly cause cuts without necessarily having a greater
chance to remove limbs.

Also separates is_sharp, has_edge, and can_puncture.
 2014-06-15 20:25:39 -04:00
Zuhayr
5ad652e90c Fixes #5195 2014-06-14 18:48:13 +09:30
Zuhayr
80db3a284b Merge pull request #5216 from Loganbacca/trainmerge 
Cargo Trains
 2014-06-14 17:13:55 +09:30
Chinsky
6d432d8e9d Merge pull request #5219 from Zuhayr/autolathe 
Autolathe rewrite.
 2014-06-12 20:28:44 +04:00
Zuhayr
0722775bda Merge pull request #5207 from mwerezak/get_turf_loc-cleanup 
Cleans up get_turf_loc()
 2014-06-12 18:13:01 +09:30
Zuhayr
136ccc347b Merge with dev. 2014-06-12 01:14:40 +09:30
Chinsky
1f7a9355f8 Merge pull request #5212 from faerindel/hydro_refactor 
Hydroponics refactor, part 1: Files.
 2014-06-11 13:30:51 +04:00
Zuhayr
4ee8f56c29 Merged master to dev, manually fixed merge issues in map, may be some left. 2014-06-11 18:11:41 +09:30
igalan
eee72ce802 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hydro_refactor 2014-06-11 03:45:00 +01:00
igalan
7d08d4701c Hydroponics refactor, part 1: Files. 
No code actually modified, just moved from all over the place to a module folder.

defines/obj/hydro.dm split:
-Seeds into seeds.dm
-Tools like the analyzer, pest and weedkillers into hydro_tools.dm. Hatches and scythe from defines/obj/weapon.dm moved there too.
-Non-edible plants like nettles into grown_inedible.dm. Special procs in items/weapons/hydroponics.dm moved there.
-Biogenerator and hydroponics tray files moved.
 2014-06-11 03:44:29 +01:00
Zuhayr
c841db56b6 Merge branch 'mining' of https://github.com/Zuhayr/Baystation12 into dev 2014-06-11 09:24:28 +09:30
mwerezak
a8816823a5 Replaces get_turf_loc() with get_turf() 
The former does exactly the same thing as get_turf(), except it runtimes
if one of the atoms has a null loc.
 2014-06-10 13:43:11 -04:00
Zuhayr
9e7fe6d700 Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this. 2014-06-11 01:14:38 +09:30
Zuhayr
c3c6f72147 More changes. Added uses for tritium, m.hydrogen and platinum. Increased cargo price for phoron. 2014-06-08 01:39:49 +09:30
Zuhayr
78918e4795 Entirely removed the Honker mech, other refs to bananium, adamantine and mythril. 2014-06-08 00:52:20 +09:30
Zuhayr
c2f2a7cde6 Refactored material definitions a little bit, removed all bananium from the codebase. 2014-06-08 00:40:34 +09:30
Zuhayr
95a6f9d613 First pass on ore distribution map and stationary drilling rig. 
Added sprites for stationary drilling gear.
Added skeleton ores for coal, adamantine, mythril. Updated some icons. Expanded mining rig functionality.
Changed adamantine and mythril to osmium and metallic hydrogen.
Added ore distribution map generation to master controller.
Added upgrading to stationary drills, tweaked other stuff.
Rewriting the ore processor and how ores handle information. Also rewrote the ore stacker.
 2014-06-07 23:07:49 +09:30
Hubblenaut
5098c6a85c Makes crashing into things possible with extinguisher or harm intent 2014-06-05 22:49:38 -04:00
sick-trigger
2df8eca7cb Health analyzers display blood type 
Saves having to mess around with your PDA during a crisis (not really,
just grab that O- bag)
 2014-06-05 18:09:31 +10:00
Loganbacca
7d7d095e5c New vehicle framework 
- Implements a new vehicle framework
- Adds cargo trains
 2014-06-03 22:18:49 +12:00
mwerezak
a6bc516313 Readds flashes to all robots except drones. 
Drones also get a special low-power flashlight, now.
 2014-06-02 23:05:37 -04:00
Zuhayr
1e135f91af Merge resolution with master. 2014-06-02 12:05:12 +09:30
Chinsky
82b6e76d4c Merge pull request #5086 from UristMcKerman/spam-filter 
Spam filter
 2014-06-01 20:09:06 +04:00
Zuhayr
a7c3c67da8 Fixes #5098 2014-06-01 21:09:30 +09:30
Mloc-Argent
ee2e68960a Merge remote-tracking branch 'upstream/master' into dev-freeze 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/cloning.dm
	code/modules/admin/admin_verbs.dm
 2014-05-31 00:17:56 +01:00
UristMcKerman
e37a70089b Tweaks for spam #2 
Added brackets surrounding tokens to make whitespace and empty tokens
removable.
Slightly modified ion storm behavior.
Increased duration required to stop spam to 5 minutes.
Added ability to expand spam filter limit with installation of message
monitor circuits.
People will see why their message been discarded.
Discarded messages will be highlighted with red color in message log.
 2014-05-29 16:05:00 +04:00
UristMcKerman
0a0ce28f68 Added spam filter 
Added spam filter functionality to message server and message server
monitor.
 2014-05-28 17:12:18 +04:00
Zuhayr
a29861480a Fixes #5023 2014-05-28 16:35:06 +09:30
Ccomp5950
4bb59352f5 Merge pull request #4968 from MrLeebo/mutiny 
Mutiny Mode
 2014-05-28 00:13:42 -05:00
Zuhayr
3b3bd5649d Merge pull request #5024 from Jarcolr/Cargo 
Adds 21 new crates and a tweak
 2014-05-28 01:21:24 +09:30
Jarcolr
049b9cc447 Fixes and a suggested change 
Fixed N2O typo, Super Pacman, anchor issues, inflatable barrier issues
that was already on master so this doesn't conflict, and added a new box
for shotgun shells and adjusted price of crates accordingly
 2014-05-27 17:15:17 +03:00
Zuhayr
4538fbabca Lots of work on hardsuits, commented out some broken WIP code, did some renaming, deleted now-redundant species-specific hardsuits. 2014-05-27 01:18:07 +09:30
Jeremy Liberman
d3541d1e08 Merge branch 'dev' into mutiny 2014-05-25 14:22:16 -05:00
Ccomp5950
ff0d667337 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze 2014-05-24 19:02:16 -05:00
Ccomp5950
3b8ee547c6 Merge pull request #5046 from mwerezak/lightbulb-box 
Fixes #5043
 2014-05-23 17:51:05 -05:00
mwerezak
c4e811829e Fixes #5043 2014-05-22 18:47:38 -04:00
mwerezak
71ad2b3aae Fixes bodybags not being able to be put back... 
...into their own box. Also affects folded cryobags.
 2014-05-22 16:44:26 -04:00
Jeremy Liberman
a95a28e303 Merge branch 'dev' into mutiny-fixes 2014-05-18 11:25:36 -05:00
Mloc-Argent
e24dd57a65 Merge remote-tracking branch 'upstream/master' into dev 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/monkey/life.dm
 2014-05-14 22:42:03 +01:00
Zuhayr
ce4f7d4708 Fixes #4979 2014-05-14 17:02:04 +09:30
bs12-bot
1f614c3149 Merge pull request #4971 from Ravensdale/and_yeah_he_doth_spake-let_there_be_light 
Fixes runtime with yellow slime extracts.
 2014-05-12 19:02:31 +01:00
Ccomp5950
bc21d1734c Merge pull request #4962 from mwerezak/internal-storage-ground-fix 
Internal storage fix
 2014-05-12 11:41:48 -05:00