cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 04:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,439 Commits 8 Branches 0 Tags
901bfe7c664836f1efa93cd8ed2ccd05e3fb8eb6
Commit Graph

726 Commits

Author SHA1 Message Date
mwerezak
1751caa64f Adds skrell headtail items 2014-11-20 15:51:52 -05:00
MrSnapwalk
07441e1e61 Attempting to fix conflicts with the following files: 
icons/mob/head.dmi
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
 2014-11-19 13:54:28 -06:00
Segrain
77ba15aea5 Slot_tie flags. 2014-11-19 18:29:51 +03:00
Zuhayr
ffc37dc151 Compile fix. 2014-11-20 00:41:45 +10:30
Zuhayr
b083cdf266 Additional interface work. 2014-11-20 00:31:12 +10:30
Zuhayr
b6ee53a4c3 Added integrated AI hardsuit interface verb, tweaked Topic() a bit so the AI can use it. 2014-11-20 00:22:07 +10:30
Zuhayr
2b4cd94650 Merge resolution. 2014-11-19 23:28:09 +10:30
MrSnapwalk
3efbebec14 Adds the new spacesuit sprites. Adds a less IMMULSION-BREAKING description for the syndicate spacesuit/helmet. 2014-11-16 19:05:09 -06:00
Zuhayr
cfb5710166 Added module damage to breach checks. Attempted to add relaymove/hardsuit interface procs but failed. 2014-11-17 00:12:57 +10:30
MagmaRam
4c5ae21aab Fixed typo that broke everything 
Haste makes waste and breaks everything. At least this time it was less
broken than last time.
 2014-11-16 03:31:22 -05:00
MagmaRam
d01e14eb58 Revert "Revert "Changed defining of icon_open and icon_closed as requested"" 
This reverts commit 046c92419e.
 2014-11-16 03:24:39 -05:00
MagmaRam
046c92419e Revert "Changed defining of icon_open and icon_closed as requested" 
This reverts commit 8d34ffe397.
 2014-11-16 03:24:33 -05:00
MagmaRam
cdec94c5a8 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into labcoat 
Conflicts:
	code/modules/clothing/suits/labcoat.dm
This should hopefully fix all that conflict going on. Hopefully.
 2014-11-16 02:56:32 -05:00
Zuhayr
8844f32385 Merge suit.dm 2014-11-16 18:15:40 +10:30
Zuhayr
c573b38d47 Working on the interface and suit hacking. 2014-11-16 18:11:15 +10:30
Chinsky
599cb247bc Merge pull request #7020 from MrSnapwalk/epsilon 
Adds several custom items/cyborg sprites.
 2014-11-16 10:17:25 +03:00
Zuhayr
6526775f81 Converted Unathi breacher suits to rigs. 2014-11-16 15:28:58 +10:30
Zuhayr
823f01f4bf Changed helmet lights over to a general system/overlays. 2014-11-16 13:40:13 +10:30
MagmaRam
8d34ffe397 Changed defining of icon_open and icon_closed as requested 2014-11-15 14:36:10 -05:00
Zuhayr
579ebb84bb Added science rig, replaced CE rig. 2014-11-15 19:17:45 +10:30
Zuhayr
ae66fb16d3 Added jetpack, added gear, fleshed out ERT hardsuits. 2014-11-15 17:39:44 +10:30
Zuhayr
4d64a11acd Manual merge of head.dmi. 2014-11-14 23:02:16 +10:30
Zuhayr
ebbb9b36b5 Moved everything to a module-based hardsuit system. 
Generalized all ninja power and gear code to work with new rig system.
Added shurikens, weapon mount, more work on deployable items.
Readded energy nets and energy blades.
Grenade launcher/charge stuff, interface stuff.
Renamed previously existing rigs to voidsuits, restructured rig and voidsuit files.
Refactored the energy net and teleportation proc.
Totally rewrote AI core/intellicard transfer procs.
Added rig sprites by Mordeth221, added step by steap suit sealing/inability to interfere with suit sealing process.
Updated map paths to use voidsuits.
Added chemical dispenser functionality, added power sink, added atom/drain_power() proc for later use.
Added rigsuit verbs, added voice changer.
Renamed MASKINTERNALS to AIRTIGHT, added internals checks for airtight helmets.
Added drain_power() procs to vulnerable machinery.
Reimplemented data theft.
Added suit maluses for losing your cell while wearing one.
Transitioned the rig suits to a back-mounted item that also controls a chestpiece.
Converted rig module to a storage item, convert ERT voidsuits to hardsuits.
 2014-11-14 22:57:26 +10:30
Chinsky
2431c930d3 Merge pull request #7007 from mwerezak/helmet 
Makes helmet icon south state consistent with east/west states
 2014-11-14 11:19:29 +03:00
Chinsky
43ee395c48 Merge pull request #7013 from Raptor1628/dev 
ERT Update
 2014-11-14 11:18:50 +03:00
MrSnapwalk
7c50b2a010 Adds FearTheBlackout/Devildabeast's custom item. 2014-11-13 12:35:42 -06:00
Zuhayr
4090f04839 Readded monkey dexterity checks in each attack_hand as appropriate. 2014-11-13 17:46:37 +10:30
Zuhayr
90d65aed57 Removed attack_paw, attack_animal and attack_slime. 2014-11-13 17:15:29 +10:30
Raptor1628
ba12d87388 ERT Update 
Bevy of ERT changes and updates, outlined in a forum thread here:
 2014-11-13 01:28:15 -05:00
mwerezak
b7429a76ea Adds tajaran/unathi tacticool sprite sheets 
No more clipping into muzzles.
 2014-11-13 01:03:29 -05:00
MagmaRam
cb723db505 Some mildly offensive wording to less offensive wording. I'm not actually sure how that got in there. 2014-11-11 13:44:57 -05:00
MagmaRam
3df1ad727a Forgot to actually set icon_open and icon_closed for labcoats. Whoops! Fixes that. 2014-11-11 13:00:38 -05:00
MagmaRam
d09d8cf921 Apparently the blue lawyer jacket didn't actually button up properly. Now it should button up, and uses the same system as everything else. 2014-11-11 12:47:02 -05:00
MagmaRam
3e5117e3eb All coats that can be buttoned are now subtypes of /obj/item/clothing/suit/storage/toggle 
This includes labcoats, IA jackets, first responder jackets, and the brown leather jackets.

This way, code for button toggling doesn't have to be duplicated for labcoats and other coats, and it's easier to add other types of coats that can be buttoned up if someone wants.
 2014-11-11 11:27:11 -05:00
MagmaRam
4a705bd371 Minor change for comments and defining the variables by full path. 2014-11-10 22:49:04 -05:00
MagmaRam
4c5695a6cc Changes labcoat code so coat buttoning isn't based on a giant switch, and icon states are set in the item itself rather than the logic for buttoning and unbuttoning. 
labcoat_open is the icon state of the labcoat while open, and labcoat_closed is the icon state of the labcoat while closed.
 2014-11-10 22:34:12 -05:00
Zuhayr
b4ea25d064 Merge conflict resolution. 2014-11-10 13:00:06 +10:30
Chinsky
1cfb49c141 Merge pull request #6954 from MagmaRam/coat 
Adds alternate CMO labcoat, with blue trim. It's in the CMO's locker as ...
 2014-11-07 03:45:30 +03:00
Chinsky
8078ffe079 Merge pull request #6939 from PsiOmegaDelta/VerbOptimization 
Verb optimization
 2014-11-05 23:23:56 +03:00
MagmaRam
f922703938 Adds alternate CMO labcoat, with blue trim. It's in the CMO's locker as well as the regular (solid blue) labcoat. The CMO still spawns with the solid blue one. 2014-11-05 14:43:12 -05:00
PsiOmega
ffdf4151bd Fixes #6934 
The ninja mask, shoes, and gloves are no longer hidden by the helmet and suit, ensuring ninjas no longer look like enhanced space-hobos.
 2014-11-05 13:25:54 +01:00
PsiOmega
bc438e21ad All the relevant examine changes. 2014-11-05 12:44:23 +01:00
mwerezak
6ac3c4c359 More custom loadout jackets + bandana 
Adds custom loadout gear:
Searif's brown leather jacket, NT brown leather jacket, and grey hoodie.
Also brings back the orange bandana, and adjusts some siemens
coefficient values that weren't making sense.
 2014-11-02 22:51:33 -05:00
mwerezak
7e2e44a61a Adds Searif's leather jackets as a custom gear 2014-11-01 23:12:21 -04:00
mwerezak
a9399c2b79 Custom loadout updates 
Adds sorting to the custom gear menu list.
Adds the white cheongsam as a custom gear item.
Moves the purple comb out of the custom item defines as it is no longer
just a custom item.
Adds pockets to the bomber jacket.
Reduces the cost of ponchos to 3.
 2014-11-01 15:56:11 -04:00
PsiOmega
601aa82ffa Fixes #6879 
Should've guessed there were more of those jackers hiding in the code.
 2014-10-29 08:04:34 +01:00
mwerezak
b8805a493f Adds two new poncho types, adjusts bomber jacket cold protection 
Adjusted the cold protection so it might actually be noticable now, forgot earlier that it was mitigated by uncovered areas.
 2014-10-28 21:05:58 -04:00
Chinsky
bad385e1d1 Merge pull request #6791 from Zuhayr/dev 
Removes references to the Syndicate and renames nuclear emergency mode.
 2014-10-21 01:13:17 +04:00
Chinsky
3796c034f3 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into master-dev 
Conflicts:
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi
	maps/tgstation2.dmm
 2014-10-20 04:52:45 +04:00
Zuhayr
99ff852e46 Removes references to the Syndicate and renames nuclear emergency mode. 2014-10-19 16:05:40 +10:30