cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-23 03:56:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
22,321 Commits 66 Branches 25 Tags
42bd4e7fbab9f97076313cf9bac0683efea695c2
Commit Graph
22321 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
GinjaNinja32 42bd4e7fba Storage accessory w_class raised to 3, typo fix 2015-02-09 11:15:19 +00:00
PsiOmegaDelta ec1fe5edc7 Merge pull request #8090 from comma/master 
Fixes #8009
 2015-02-09 08:38:50 +01:00
Chinsky 5496c7bbf0 Fixes #8009 
Fixed flaslights producing infinite light/
 2015-02-09 08:05:24 +03:00
PsiOmegaDelta 4cab2a2c8e Merge pull request #8086 from GinjaNinja32/apcfix 
Fixes possible href exploit with APCs
 2015-02-08 21:04:45 +01:00
GinjaNinja32 4495f4c8ed Fixes possible href exploit with APCs 2015-02-08 19:58:28 +00:00
Chinsky 6e3391f723 Merge pull request #8079 from mwerezak/doors 
Fixes doors being usable remotely when broken
 2015-02-08 13:11:52 +03:00
PsiOmegaDelta 187d90c933 Merge pull request #8080 from Kelenius/ofOreAndScanners 
Fixes ore scanner
 2015-02-08 09:50:31 +01:00
Kelenius 71dabeb557 Fixes ore scanner 
Before: it didn't scan dark tiles and the tile you were standing on.
Now: scans both.
 2015-02-08 05:52:12 +03:00
mwerezak 2d744fd47a Fixes doors being usable remotely when broken 
Fixes airlock doors being able to be opened and closed remotely (by
buttons, airlocks, or docking) when broken. Also removes some redundant
code, and refactors a few checks.
 2015-02-07 17:52:16 -05:00
Chinsky 03125b97f4 Merge pull request #8056 from PsiOmegaDelta/ATMMachine 
Corrects some RAS syndrome issues
 2015-02-07 08:39:59 +03:00
Chinsky fdd27dec21 Merge pull request #8078 from Ccomp5950/mentors 
Added buttons back to Mentors
 2015-02-07 08:24:30 +03:00
Ccomp5950 461202280a Merge pull request #8072 from GinjaNinja32/scramble_consistency 
scramble() consistency
 2015-02-07 00:13:53 -05:00
ccomp5950 a07e0a044f Added buttons back to Mentors 
Before:  Mentors see ahelps they only see ckeys, no links no character names, etc.

Now:  Character names shows up and I've added a mentor specific link bar so mentors can use the buttons they already have easily.
 2015-02-07 00:04:50 -05:00
GinjaNinja32 0651bb8d84 Adds a cache to scramble() so that feeding the same input through multiple times in a short timespan results in the same output string. 
This means that you'll no longer get the radio message being entirely different from the non-radio message, and that all players will see the same scrambled string
 2015-02-06 23:26:09 +00:00
Chinsky eeb118b0af Merge pull request #8070 from GinjaNinja32/patch-1 
Fixes "" from languages over radio.
 2015-02-06 22:49:56 +03:00
GinjaNinja32 c95399de91 Fixes "" from languages over radio. 2015-02-06 19:43:39 +00:00
Zuhayr 7c31bb18f5 Merge pull request #8064 from GinjaNinja32/lingfix 
Fixes changeling stings not working from certain positions
 2015-02-07 05:46:13 +10:30
Chinsky 7da96fd5e4 Merge pull request #8065 from GinjaNinja32/fix 
Two fixes
 2015-02-06 22:09:23 +03:00
GinjaNinja32 ef197fb995 Two fixes 
Fixes airless turf in Fore Starboard Solar Control causing minor atmos alert at roundstart
Fixes clean_map_git.sh being set non-executable and using non-sh-compatible features with #!/bin/sh
 2015-02-06 16:04:37 +00:00
Zuhayr caa4e088cd Merge pull request #8057 from mwerezak/master 
Fixes windows taking excessive damage from projectiles
 2015-02-07 02:34:03 +10:30
GinjaNinja32 251e162a2c Fixes changeling sting A* call, adds messages to let the changeling know what went wrong if it did 2015-02-06 09:52:01 +00:00
mwerezak 41816c26bf Fixes windows taking excessive damage from projectiles 2015-02-06 00:03:09 -05:00
Chinsky d847232692 Merge pull request #8036 from PsiOmegaDelta/GitMergeInstaller 
Git Merge Installers
 2015-02-06 00:14:33 +03:00
PsiOmega 50064d86b3 Corrects ATM Machine syndromes. 2015-02-05 11:56:00 +01:00
Mloc 22eb00d838 Merge pull request #8046 from SkyMarshal/patch-3 
Fixes the fix for supersonic walking.
 2015-02-04 17:35:53 +00:00
SkyMarshal d5c8a6262a Fixes the fix for supersonic walking. 2015-02-04 10:33:39 -07:00
PsiOmegaDelta 31c81a697d Merge pull request #8044 from SkyMarshal/patch-3 
Fixes supersonic walking with canes.
 2015-02-04 13:34:59 +01:00
SkyMarshal 952fd3a373 Fixes supersonic walking with canes. 2015-02-04 05:30:56 -07:00
PsiOmegaDelta b94e3d06fe Merge pull request #7 from GinjaNinja32/git_merge_installers 
Linux versions of git_merge_installer scripts
 2015-02-04 11:18:29 +01:00
GinjaNinja32 f4435503cc Linux versions of PsiOmegaDelta's git_merge_installer scripts 2015-02-04 10:12:11 +00:00
PsiOmega 0673c9179b Git Merge Installers 
There are now two basic bat scripts in dmitool and mapmerge which painlessly inserts the necessary lines for the commit tools to work into .git/config.
 2015-02-03 22:02:50 +01:00
Chinsky c73b046a5b Merge pull request #8025 from comma/TheOtherPurge 
Removing additional fun
 2015-02-03 17:28:11 +03:00
Chinsky b70db8d8d7 RIP in history, dead code 2015-02-03 17:19:56 +03:00
Chinsky a88349e9b4 Merge pull request #8017 from PsiOmegaDelta/TheGreatPurge 
Removing all the fun stuff
 2015-02-03 16:36:47 +03:00
PsiOmega 5c41f24183 Cleans up exodus-2.dmm. 2015-02-03 14:35:45 +01:00
PsiOmega 1732d0c79a Merge remote-tracking branch 'upstream/master' into TheGreatPurge 
Conflicts:
	code/WorkInProgress/computer3/computers/message.dm
	code/WorkInProgress/kilakk/responseteam.dm
 2015-02-03 14:16:14 +01:00
Chinsky 95eacd2185 Merge pull request #8008 from volas/sanitize_procs 
Fixes for some sanitize moments
 2015-02-03 15:08:47 +03:00
PsiOmegaDelta cdfe4b8e79 Merge pull request #4 from SkyMarshal/WIPurge 
My Folder
 2015-02-03 12:10:31 +01:00
SkyMarshal 7c1b70af93 Removes jungle 2015-02-03 04:01:16 -07:00
SkyMarshal 8898689c5d Cleared out my WIP folder. 2015-02-03 03:20:42 -07:00
SkyMarshal 15bf312f13 Fixes up some helpers. 2015-02-03 03:18:34 -07:00
PsiOmegaDelta 0aff1a6c72 Merge pull request #5 from comma/wipurge 
Wipurge
 2015-02-03 10:49:19 +01:00
PsiOmegaDelta dc4cbb600e Merge pull request #6 from PsiOmegaDelta/revert-3-wipurge 
Revert "dnm Another pass at WIP folder"
 2015-02-03 10:35:52 +01:00
PsiOmegaDelta b7b9a49204 Revert "dnm Another pass at WIP folder" 2015-02-03 10:35:42 +01:00
PsiOmegaDelta 2d7e8ca0aa Merge pull request #3 from comma/wipurge 
dnm Another pass at WIP folder
 2015-02-03 10:20:46 +01:00
Chinsky 649473e0ec Restred medical side effects file since turns out it's used (need to look into why it doesn't appear to be later) 2015-02-03 12:19:09 +03:00
Chinsky 72463a35f3 Another pass at WIP folder 2015-02-03 12:14:13 +03:00
Zuhayr 5f9d1b0681 Merge pull request #8019 from DeeUnderscore/borg-radio 
Fix some problems with borg radios
 2015-02-03 19:22:04 +10:30
Chinsky 7027b74ae7 Another pass at WIP folder 2015-02-03 11:30:28 +03:00
PsiOmegaDelta b17daaac0a Merge pull request #2 from comma/wipurge 
Wipurge
 2015-02-03 08:28:04 +01:00