cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 04:02:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,196 Commits 5 Branches 0 Tags
d7650f55ea65bc3b3b89b51f564749faee530e23
Commit Graph

375 Commits

Author SHA1 Message Date
PsiOmega
c7bd20ceb6 Rig AI fixes. 
Changes how the state for the NanoUI window is selected.
Fixes and optimizes the hardsuit module tab for rig AIs.
Corrects some qdel issues for ejected rig AIs.
 2015-08-23 13:33:10 +02:00
Zuhayr
ca4b56cc77 Reapplying some species_restricted cleanup that was merged over. Allows Vox to wear softsuits. 2015-08-23 01:24:49 +09:30
Zuhayr
bb82f80885 Added get_bodytype() species proc as groundwork for subspecies. 
Conflicts:
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/organs/organ_icon.dm
 2015-08-22 02:53:16 +09:30
Raptor1628
0274f87172 Fixes Grenade Launcher module sprite again 
It didn't stick last time, so let's go again!
 2015-08-13 10:11:11 -04:00
mwerezak
0ceb0e291d Fixes #10314 
Replaces every check for a hardcoded material stack type with a check
for material of the stack.
 2015-08-02 00:01:10 -04:00
mwerezak
b0434d90b2 Adds stealth rig sprites 
Adds sprites for the stealth rig, so that people don't mix it up with
the ninja. Helmet is different (based on swat mask and NVGs), everything
else is a copy of the ninja suit.
 2015-07-31 14:41:32 -04:00
mwerezak
1bfa4da870 Fixes #10315 
The cybersuit is no longer space-proof. In exchange, it has a few more
modules, built-in insulated gloves, and grippy shoes.
 2015-07-31 14:41:31 -04:00
Zuhayr
3579ab8373 Merge pull request #10259 from mwerezak/rig-module-fix 
Fixes #10151
 2015-07-22 10:45:21 +09:30
mwerezak
c7488c712b Fixes #10151 2015-07-21 20:34:39 -04:00
Zuhayr
03927918c6 Merge pull request #10187 from Baystation12/master 
Master > dev-freeze
 2015-07-15 16:10:13 +09:30
mwerezak
5ab051d7a8 Fixes #8545 2015-07-14 00:38:58 -04:00
Zuhayr
9376e33acf Fixes #10159 2015-07-14 05:19:00 +09:30
PsiOmegaDelta
2ed978b1e1 Wizards can no longer de-jaunt in turfs with dense objects. 
Also fixes an exploit where wizards could cast CentCom restricted spells by hiding inside objects, such as lockers or coffins.
 2015-07-12 14:31:26 +02:00
PsiOmegaDelta
796c6c7e42 Teleportation code now ignores dense objects with the ON_BORDER flag. 2015-07-11 17:30:40 +02:00
PsiOmegaDelta
1287ad818a Ninjas can no longer teleport unto turfs that contain solid objects. 2015-07-11 11:12:08 +02:00
Zuhayr
946c445b29 Fixes #9896 2015-07-10 01:14:12 +09:30
Atlantis
e37503dedb Fixes #9965 
- Hardsuit injectors now only work on carbon-based mobs. This prevents injecting of AIs, Robots and other silicon-based mobs.
 2015-07-08 21:44:04 +02:00
Techhead0
f2f34b9a38 Minor tweaks to voidsuits. 
Component removal uses a dialogue box instead of removing items in a set order.
Renames "Eject Tank" to avoid duplicate verb names.
Changes order of components when equipping voidsuits.
Two user message changes.
 2015-06-08 05:30:11 -04:00
PsiOmega
5e84bfa57c Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/clothing/spacesuits/rig/suits/ert.dm
 2015-05-30 15:59:54 +02:00
Raptor1628
62ef32a725 Rig Icon Fixes 
Fixes some incorrect names that were resulting in broken icons.
 2015-05-27 23:32:27 -04:00
mwerezak
d65ec62dcb Fixes #9493 2015-05-26 22:49:16 -04:00
PsiOmega
c21a456379 Fixes #9447. 
The inteliCard now has a NanoUI interface, allowing it to utilize custom CanUseTopic() checks depending on context, in-hand or in-rig.
 2015-05-24 11:33:54 +02:00
PsiOmega
e74c0e65bf Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/power_cells.dm
 2015-05-22 08:26:13 +02:00
mwerezak
e23f5e7e06 Fixes hardsuit shocking 2015-05-18 20:09:31 -04:00
Zuhayr
358867f3b5 Major sheet and material refactor. 2015-05-17 01:46:53 +09:30
Zuhayr
150b24023e Renamed kitchen utensils. 2015-05-16 21:24:36 +09:30
Zuhayr
325bd42c66 Fixes #9233 2015-05-15 23:37:52 +09:30
Zuhayr
624a6b0bca Fixes #9250 2015-05-15 18:26:53 +09:30
PsiOmega
f9306431b7 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
 2015-05-14 22:20:58 +02:00
PsiOmega
91f67e5dc5 Adjusts rig stealth module costs. 
Activation and active power costs were previously a tenth of the same costs for a mere energy blade.
Now costs matches that of an energy blade.
 2015-05-13 22:38:52 +02:00
Chinsky
e9cc39039c Merge pull request #8946 from Zuhayr/miningstuff 
Wall refactor/mining changes.
 2015-05-12 13:13:31 +03:00
Zuhayr
c06323ef7a Merge pull request #9199 from Techhead0/voidmachine-englishlists 
Changes machine frames and voidsuits to use proc/english_list() and removes frame_desc
 2015-05-12 14:20:37 +09:30
Zuhayr
495952ff5d Changed steel material name to a define. 2015-05-12 13:08:41 +09:30
Techhead0
f6977dd8ed Changes machine frames and voidsuits to use proc/english_list() 
Also includes formatting changes to voidsuit examine.
 2015-05-11 20:29:35 -04:00
Zuhayr
e28acd5045 Dev merge. 2015-05-11 18:45:14 +09:30
Zuhayr
bc50ba5166 Merge resolution. 2015-05-11 11:47:24 +09:30
Techhead0
95aef467a0 Magboots can be worn over shoes 
Equipping magboots or a voidsuit with magboots installed will place them
over any existing shoes. Existing shoes are replaced on feet when magboots
are unequipped. Magboots cannot be worn over other magboots.
Fixes #9125
Changelog for this and my previous voidsuit changes included.
 2015-05-09 14:20:03 -04:00
mwerezak
549270c73c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color 
Conflicts:
	code/game/machinery/washing_machine.dm
	code/modules/mob/living/carbon/human/update_icons.dm
 2015-04-26 14:53:01 -04:00
Zuhayr
dbf8e53020 Mass rename of 'metal' to steel, refactor of walls and falsewall mineral construction, refactor of materials and ores. 2015-04-26 12:53:26 +09:30
PsiOmega
1fea589ad7 Merge remote-tracking branch 'upstream/dev' into TheSummoning 
Conflicts:
	code/game/machinery/cryopod.dm
	code/game/objects/items/weapons/clown_items.dm
 2015-04-24 17:13:37 +02:00
PsiOmega
1ae0ad6d92 Updates the atom_pool, now datum_pool, to handle any datum object. 
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
 2015-04-24 09:59:05 +02:00
mwerezak
5b037670b3 Removes most instances of item_color 
Notable exception is for clothing/under, those will have to be removed once item_state override is implemented.
 2015-04-22 17:40:27 -04:00
Mark9013100
f97d73f2a8 Fixes the naming of the merc space suits 2015-04-20 18:19:04 -04:00
PsiOmega
08fa1193ce Adds Hardsuit Module tab. 
Allows one to (de)activate, engage, select and change module charges from the  	"Hardsuit Modules" tab panel.
Basic idea similar to spells.
 2015-04-16 08:54:04 +02:00
Chinsky
d408886333 Merge pull request #8837 from Techhead0/voidtank 
Voidsuit Examine info.
 2015-04-14 16:36:44 +03:00
Techhead0
d27f7ef799 Voidsuit Examine info. 
Examining voidsuits will tell you what items are installed (with tiny icons) and the pressure of any installed tanks.
 2015-04-13 11:08:07 -04:00
PsiOmegaDelta
095a572c71 Merge pull request #8829 from Techhead0/voidtank 
Installable Voidsuit tanks.
 2015-04-13 13:57:56 +02:00
Techhead0
c8487db13b Eject Tank verb and span classes 
Now you can eject your tank onto the ground while wearing the suit.
Toggle Helmet verb now uses span classes.
 2015-04-13 05:02:20 -04:00
Chinsky
7a40d193fe Merge pull request #8801 from PsiOmegaDelta/NanoRefactorUmptheen 
Refactors NanoUI interaction (again)
 2015-04-11 04:43:50 +03:00
Chinsky
be3f372680 Merge pull request #8788 from PsiOmegaDelta/PortedSpells 
Ports /vg/'s spell system for use by the cult port.
 2015-04-11 02:05:58 +03:00