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
24,610 Commits 5 Branches 0 Tags
95ea7c110ce9452ba9b98107f87a09e6e9bd0671
Commit Graph

11123 Commits

Author SHA1 Message Date
Zuhayr
95ea7c110c Fixes several wall issues. 2015-05-15 13:43:00 +09:30
PsiOmegaDelta
4f40e92a95 Merge pull request #9272 from Mloc/nanoui 
better nanoui caching + fixes
 2015-05-14 23:48:15 +02:00
Mloc
cfb51cf198 better nanoui caching + fixes 
Signed-off-by: Mloc <colmohici@gmail.com>
 2015-05-14 22:35:50 +01:00
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
Ccomp5950
1e6921f924 Merge pull request #9268 from Mloc/lightwrite 
fix for "cleaning light"
 2015-05-14 15:08:03 -04:00
Chinsky
8d83e8d452 Merge pull request #9202 from Zuhayr/customitems 
Custom items refactor.
 2015-05-14 21:47:04 +03:00
Mloc
d95701a7b5 fix for "cleaning light" 
Signed-off-by: Mloc <colmohici@gmail.com>
 2015-05-14 18:03:18 +01:00
Mloc
d6f4828f2a fix an issue with destroying light sources that have 0 light_range 
Signed-off-by: Mloc <colmohici@gmail.com>
 2015-05-14 10:58:52 +01:00
PsiOmegaDelta
9ed8f69e02 Merge pull request #9240 from Techhead0/internalsBox 
Moves survival boxes to species datums.
 2015-05-14 09:38:24 +02:00
Chinsky
713deb4137 Merge pull request #9253 from PsiOmegaDelta/StealthFixes 
Adjusts rig stealth module costs.
 2015-05-14 04:17:56 +03:00
Chinsky
dd008c7790 Merge pull request #9254 from PsiOmegaDelta/CellDepletion 
Using more energy than a cell has stored now drains the cell.
 2015-05-14 04:17:43 +03:00
PsiOmega
3d1b671703 Asking for more energy than a cell has stored now drains the cell. 
Fixes #9252.
 2015-05-13 23:38:49 +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
Daranz
b95692e484 Fix a problem in human/has_eyes() 2015-05-13 13:58:37 -04:00
Techhead0
875a4fd893 Moves equip_survival_gear into job controller, species gear into datums. 2015-05-13 04:07:01 -04:00
Zuhayr
1dfade1a33 master>dev 2015-05-13 17:09:57 +09:30
Zuhayr
3c10cc5852 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into customitems 2015-05-13 17:00:10 +09:30
Techhead0
f41300bbe3 Merge remote-tracking branch 'remotes/Baystation12/dev' into internalsBox 
Conflicts:
	maps/exodus-1.dmm
 2015-05-13 03:10:36 -04:00
Techhead0
e38ef1c7ef Moves survival boxes to species datums. 
Surivival gear is now assigned based on species. Most
species get standard gear, but Vox receive a nitrogen
tank instead, and Diona obtain an emergency flare
instead of a survival box.
As a side effect, engineers no longer spawn with larger
emergency tanks.
Fixes #9237
 2015-05-13 02:31:17 -04:00
Zuhayr
a9f936fe42 Added exosuit customisation kits to cargo. 2015-05-13 11:20:54 +09:30
Zuhayr
eef2f589ce Housekeeping. 2015-05-13 10:32:26 +09:30
Chinsky
ad67215b08 Merge pull request #9073 from PsiOmegaDelta/QDels 
Implementing Destroy():s
 2015-05-12 18:26:57 +03:00
Hubblenaut
32b463237f Final adjustments to icons, adds delay to pinning 2015-05-12 17:21:37 +02:00
GinjaNinja32
c952507f3c Fixes carp attacking mechs over z-levels 
Fixes #9198.
 2015-05-12 15:53:28 +01:00
Zuhayr
f908119b98 Very minor oversight. 2015-05-12 23:56:51 +09:30
Zuhayr
4e85c5f387 Dev merge. 2015-05-12 23:33:29 +09:30
Zuhayr
9896bb4a9c Cleanup of custom item icons. 2015-05-12 23:21:23 +09:30
Chinsky
009dc181b2 Merge pull request #9203 from mwerezak/vines2 
Updates weed control crate
 2015-05-12 15:58:47 +03:00
Hubblenaut
1b3ddb8633 Merge remote-tracking branch 'upstream/dev' into dev 
Conflicts:
	code/game/objects/structures/stool_bed_chair_nest/bed.dm
	code/modules/mob/mob_grab.dm
 2015-05-12 14:39:21 +02:00
Zuhayr
49930fe55d Debugging! 2015-05-12 21:30:06 +09:30
PsiOmega
b52cf35680 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/projectiles/projectile.dm
 2015-05-12 13:40:47 +02:00
Zuhayr
2222445eb3 Merge pull request #9166 from MrSnapwalk/AI-and-pAI-sprites 
Adds 7 new AI core sprites and adds new pAI card sprites.
 2015-05-12 21:01:30 +09:30
Chinsky
e9cc39039c Merge pull request #8946 from Zuhayr/miningstuff 
Wall refactor/mining changes.
 2015-05-12 13:13:31 +03:00
PsiOmegaDelta
d12d1b93d1 Merge pull request #9204 from Ccomp5950/mangled_request 
Holodeck items no longer spam admin attack logs.
 2015-05-12 11:22:02 +02:00
Zuhayr
c8135cf87b Merge pull request #9205 from mwerezak/masks 
Snacks, drinks, and pills now check mouth coverage
 2015-05-12 18:11:48 +09:30
Zuhayr
b15ff78302 Merge pull request #9130 from mwerezak/device-powercell 
Adjusts charge cost for energy type guns
 2015-05-12 18:11:39 +09:30
Zuhayr
c84089af3c Merge pull request #9206 from comma/deaddoll 
Preview icon refactor
 2015-05-12 15:59:00 +09:30
Zuhayr
f76a1d2024 Removed custom item defines, refactored mech kits. 2015-05-12 15:49:56 +09:30
PsiOmega
66ead991e7 Terminals, scrubbers, airlocks, and alarms get a Destroy() review. 2015-05-12 08:16:30 +02:00
Zuhayr
59af7e5c4d Refactor/rewrite of custom item spawning. 2015-05-12 15:14:51 +09:30
PsiOmegaDelta
b30465374d Merge pull request #9201 from GinjaNinja32/vine 
Fixes vines not being vines.
 2015-05-12 07:04:41 +02: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
Chinsky
a6ecdedf74 Fix for being forever tajaran 2015-05-12 07:48:54 +03:00
Chinsky
495783de59 As per Ginja's suggestion, dummies are now used one per prefs datum. 
Slightly less metal but amount of stuff created/deleted in every human is just too huge.
 2015-05-12 07:24:25 +03:00
Techhead0
0d9a482be8 Removes frame_desc from circuitboards. 2015-05-12 00:09:51 -04:00
Zuhayr
3184f157e9 qdel 2015-05-12 13:12:58 +09:30
Chinsky
86c8c8c52b Changed similar proc in datacore to just use icons of actual human it gets. Works fine for both latejoin and roundstart. 
Also fixed a runtime, somehow head was created without a tajaran and got lost.
 2015-05-12 06:42:08 +03:00
mwerezak
b721eb36ef Span classes and visible_message(), changelog 2015-05-11 23:40:44 -04:00
Zuhayr
495952ff5d Changed steel material name to a define. 2015-05-12 13:08:41 +09:30
Chinsky
5c8ceae2fa Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into deaddoll 
Conflicts:
	code/modules/mob/new_player/preferences_setup.dm
 2015-05-12 06:04:22 +03:00