cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-22 19:46:36 +01:00
Code Issues Packages Projects Releases Wiki Activity
24,333 Commits 66 Branches 25 Tags
024dabef7b536cdfd5ca3b48dac003981dd7d0c5
Commit Graph
24333 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Atlantiscze 024dabef7b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into newmalf-merge 2015-05-05 22:13:58 +02:00
Atlantis 5201b88f60 Minor fix 
- Malf AI spawning now works, currently only via TraitorPanel, the gamemode itself is still broken.
 2015-05-05 21:36:02 +02:00
Mloc 53d85013a4 Merge pull request #9100 from Baystation12/revert-9098-patch-1 
Revert "Applies Icon Caching to battery racks"
 2015-05-05 15:36:39 +01:00
Mloc 82b810d363 Revert "Applies Icon Caching to battery racks" 2015-05-05 15:36:19 +01:00
Chinsky 094495c867 Merge pull request #9098 from StarSmasher44/patch-1 
Applies Icon Caching to battery racks
 2015-05-05 17:29:18 +03:00
StarSmasher b27dbdaaf5 I'm too broken for this 
Also fixes this one, probably.
 2015-05-05 14:21:28 +02:00
StarSmasher 1c9dbfdb2b Removes unneeded variable 
All good now.
 2015-05-05 14:13:26 +02:00
StarSmasher 89b65e216f Applies Icon Caching to battery racks 
In my tests a while ago, I found that the battery racks came quite high in the profiler. So I decided to see if I could alleviate some of that trouble.

Very simple, caches the icons based off of previous work done on the APC, requires less processing for the icon updates.
Function has been tested and has been used on a live server for a few weeks prior to said server's shutdown.
Will make a 2nd PR following another like this except for HUD icons.
 2015-05-05 13:12:52 +02:00
PsiOmegaDelta ca5ed9109d Merge pull request #9095 from PsiOmegaDelta/dev 
Dev
 2015-05-05 08:24:23 +02:00
PsiOmega 65badb6a3e Changelog update. 2015-05-05 08:14:02 +02:00
PsiOmega 151c5204ee Merge remote-tracking branch 'upstream/master' into dev 
Conflicts:
	code/modules/projectiles/gun.dm
	html/changelogs/RavingManiac-master.yml
 2015-05-05 08:11:28 +02:00
Chinsky 864d40d1c4 Merge pull request #9094 from Baystation12/dev-freeze 
Couple fixes that were too late for merge
 2015-05-05 03:58:05 +03:00
Chinsky e0a903d9eb Merge pull request #9093 from Baystation12/master 
Master->Freeze
 2015-05-05 01:42:57 +03:00
Ccomp5950 4a7d970bce Merge pull request #9090 from Kelenius/ofLogsAndTypos 
Fixes a few log-destroying lines
 2015-05-04 15:30:13 -04:00
PsiOmegaDelta d1227bdec5 Merge pull request #9087 from volas/cinematic2 
Modification to 'cinematic' command
 2015-05-04 20:55:08 +02:00
Kelenius 33dde892e2 Fixes a few log-destroying lines 2015-05-04 21:33:30 +03:00
Chinsky 8294f02c1b Merge pull request #9072 from PsiOmegaDelta/BrokenGrills 
Grilles and rod tweaks.
 2015-05-04 21:25:24 +03:00
Chinsky 3f03fea06e Merge pull request #9074 from RavingManiac/dev-2 
Explosion tweaks and fixes
 2015-05-04 21:25:12 +03:00
Chinsky 7f8c4b4d4d Merge pull request #9081 from Kelenius/ofChemAndFour 
Chemistry-Reagents: absolute paths and split
 2015-05-04 21:24:09 +03:00
Chinsky 587015ff4e Merge pull request #9086 from RavingManiac/master 
Intent menu appears on zoom
 2015-05-04 21:24:06 +03:00
PsiOmega 1edb39b556 Merge remote-tracking branch 'upstream/dev' into BrokenGrills 2015-05-04 14:58:24 +02:00
PsiOmegaDelta 1268f107d5 Merge pull request #9089 from PsiOmegaDelta/dev 
Dev
 2015-05-04 14:57:29 +02:00
PsiOmega 6658f52ced Merge remote-tracking branch 'upstream/master' into dev 2015-05-04 14:56:15 +02:00
PsiOmegaDelta 66fc996be2 Merge pull request #9066 from Ravensdale/yonderAtmosia 
Atmosia tweaks
 2015-05-04 14:52:41 +02:00
PsiOmegaDelta d86dd60c63 Merge pull request #9064 from Loganbacca/smokeFix 
Chem smoke fadeOut sanity checks
 2015-05-04 14:52:33 +02:00
PsiOmegaDelta 38b9eba4ff Merge pull request #9035 from mwerezak/transfer-shuttle 
Minor escape shuttle adjustment
 2015-05-04 14:52:30 +02:00
volas 7ff68f8757 Modification to 'cinematic' command 2015-05-04 12:10:59 +03:00
RavingManiac a35f2c0ad6 Changelog update 2015-05-04 17:03:37 +10:00
RavingManiac 6123c8421e Intent menu appears on zoom 2015-05-04 16:58:24 +10:00
Kelenius e4ce047bd1 Chemistry-Reagents: absolute paths and split 2015-05-04 00:29:42 +03:00
RavingManiac 97adee16db Recursive explosion resistance values for walls, space tiles, grilles and airlocks tweaked 
Lattices now spawn properly when a floor tile is destroyed by an explosion. Probabilities involved tweaked
 2015-05-03 21:53:02 +10:00
PsiOmega d068b57388 Changelog update. 2015-05-02 21:55:13 +02:00
PsiOmega 3866fda394 Merge remote-tracking branch 'upstream/master' into dev 
Conflicts:
	code/ZAS/Turf.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/living.dm
	code/modules/recycling/sortingmachinery.dm
 2015-05-02 21:50:11 +02:00
PsiOmega 46ad005b50 Adds two missing pooling instances and corrects broken grilles health status. 2015-05-02 21:46:30 +02:00
PsiOmega 632ef4dd86 Changelog entry. 2015-05-02 21:38:06 +02:00
PsiOmega d6f59326c1 Updates maps to use the new grilles. 2015-05-02 21:37:01 +02:00
PsiOmega ca7fa2aa19 Grilles and rods. 
Grilles no longer return more rods than they were created from when destroyed (by method other than wirecutters).
Rods are now acquired from and returned to a pool.
Also adds a pre-broken grille for mapping, avoids the case where one might be able to destroy the same grille twice.
 2015-05-02 21:35:02 +02:00
PsiOmegaDelta 5d13f3091c Merge pull request #9067 from Jarcolr/gauniform 
Adds foxeye's approved custom item
 2015-05-02 21:19:22 +02:00
Chinsky a9b1f8bfe0 Merge pull request #9042 from PsiOmegaDelta/Buttons 
Small remote button refactor.
 2015-05-02 19:50:24 +03:00
Chinsky ab68486038 Merge pull request #9068 from volas/paper_merge 
merge fix
 2015-05-02 19:50:02 +03:00
Jarcolr 471988b080 Adds foxeye's custom item 
http://baystation12.net/forums/viewtopic.php?f=33&t=12421
 2015-05-02 11:19:52 +03:00
volas 93d120a24c merge fix 2015-05-02 11:16:15 +03:00
Chinsky d5495870d1 Merge pull request #9045 from mwerezak/resist 
Resist code cleanup, plus fixes
 2015-05-02 08:22:51 +03:00
Chinsky aeda1db3c5 Merge pull request #9041 from PsiOmegaDelta/ChitterChitter 
Fixes #9029.
 2015-05-02 08:22:09 +03:00
Chinsky 144c1eb321 Merge pull request #9033 from mwerezak/zas-fix 
Fixes #8987, lost edges from merged zones
 2015-05-02 08:21:53 +03:00
Chinsky 8f1a9a9375 Merge pull request #9040 from PsiOmegaDelta/LOOCToggle 
Admins can now toggle OOC and LOOC separately from each other.
 2015-05-02 08:21:50 +03:00
Ravensdale e7719157ff Atmos tweaks 2015-05-01 21:07:23 -07:00
Loganbacca 6238dabf88 Chem smoke fadeOut sanity checks 
Ported updates from /tg/ to fadeOut code. Updates written by vista-
 2015-05-02 13:33:25 +12:00
Zuhayr 1d99721f1b Merge pull request #9052 from Ravensdale/beepBoop 
Fix animation error with east facing droid sprite
 2015-05-02 09:51:36 +09:30
Zuhayr 24075c0c3b Merge pull request #9046 from PsiOmegaDelta/OfMiceAndMen 
Mice are now numbered.
 2015-05-02 09:49:14 +09:30