cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,048 Commits 5 Branches 0 Tags
5b037670b35219e8e4eebde357b61375e9e2945c
Commit Graph

18117 Commits

Author SHA1 Message Date
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
mwerezak
94c9b9b8ca Adjusts glove siemen coefficients 
Also adjusts jumpsuit rolling to be more amenable to future changes.
 2015-04-22 16:46:14 -04:00
PsiOmegaDelta
7a27aece0d Merge pull request #8941 from Baystation12/master 
Dev
 2015-04-22 09:32:56 +02:00
PsiOmegaDelta
5da7c877d3 Merge pull request #8930 from Mark9013100/mercsuitfix 
Fixes the naming of the merc space suits
 2015-04-21 19:06:06 +02:00
PsiOmegaDelta
c1558ed518 Merge pull request #8928 from GinjaNinja32/diona 
Adds diona 'split' command
 2015-04-21 19:05:41 +02:00
Chinsky
bcfb746465 Merge pull request #8901 from PsiOmegaDelta/ShakeShake 
Structure/table shaking.
 2015-04-21 20:04:41 +03:00
Kelenius
446efb3809 Fixed attacking blob breaking logs 2015-04-21 19:57:45 +03:00
PsiOmega
eaa8e341f9 Makes it possible to shake structures people are climbing on to make them stop. 2015-04-21 17:45:09 +02:00
GinjaNinja32
a440b228c9 Diona 'split' command, plus bugfix 2015-04-21 01:55:43 +01:00
Mark9013100
f97d73f2a8 Fixes the naming of the merc space suits 2015-04-20 18:19:04 -04:00
Zuhayr
fc9c00bb5b Merge pull request #8867 from Jarcolr/patch-1 
Fixes #8810
 2015-04-20 18:04:04 +09:30
PsiOmega
7f6b908af2 Fixes #8917. 
Makes it possible to scan for new sensors as necessary.
Useful if the ability to remove/change/create new sensors is added.
 2015-04-20 10:03:54 +02:00
PsiOmega
3810bef4bf Merge remote-tracking branch 'upstream/master' into dev 2015-04-20 08:39:56 +02:00
Chinsky
b437c5654a Merge pull request #8902 from PsiOmegaDelta/FiredoorFixTwo 
Another emergency shutter fix.
 2015-04-19 16:10:07 +03:00
Chinsky
940b5c8c62 Merge pull request #8891 from volas/sanitize3 
sanitize() 3
 2015-04-19 14:59:36 +03:00
Chinsky
109aed4fcf Merge pull request #8897 from PsiOmegaDelta/LaptopsAreTheWorst 
Fixes #8895.
 2015-04-19 14:59:25 +03:00
Chinsky
a3962980ac Merge pull request #8898 from PsiOmegaDelta/eject_cartridge 
Adds a PDA cartridge ejection verb.
 2015-04-19 14:56:59 +03:00
volas
7dedbc6d78 Alternative copytext, safe for html entities 2015-04-19 12:37:04 +03:00
Zuhayr
0b03a389df Merge pull request #8910 from Baystation12/master 
Master into dev
 2015-04-19 17:26:04 +09:30
Zuhayr
d289510da4 Merge pull request #8856 from comma/getarea 
get_area returns master now
 2015-04-19 15:45:20 +09:30
Neerti
b178e56a3b Lazy fix because microwaves are terrible. 2015-04-18 22:04:05 -04:00
PsiOmega
b295b9e3c6 Another emergency shutter fix. 
I goofed, and dropped the distance check.
 2015-04-18 20:13:25 +02:00
Zuhayr
05d05732f8 Merge pull request #8888 from PsiOmegaDelta/ThemLogs 
Ports the changelog system used by /vg/, /tg/, and others.
 2015-04-19 03:17:49 +09:30
Zuhayr
243157d339 Merge pull request #8894 from PsiOmegaDelta/CleanStart 
Clean server start.
 2015-04-19 03:17:29 +09:30
PsiOmega
804ca5aa0b Fixes #8250. 
Uncomplicates the examine pre-check.
Ensures door/examine() returns the proper value.
 2015-04-18 19:25:22 +02:00
PsiOmega
a4fbb01e2b Makes it possible to write [date] and [time] to get the current date and time in ISO 8601 format. 2015-04-18 18:40:35 +02:00
PsiOmega
c39c929db7 Adds a PDA cartridge ejection verb. 
The most requested feature.
 2015-04-18 18:18:11 +02:00
PsiOmega
725e3335d2 Fixes #8895. 
Laptops now use the proper proc for checking camera status.
 2015-04-18 17:49:40 +02:00
volas
dbd239f4ec Corrections dual sanitizing 2015-04-18 17:49:25 +03:00
Chinsky
0206d6db8f Merge pull request #8868 from Jarcolr/patch-2 
Fixes #8633
 2015-04-18 17:44:22 +03:00
Chinsky
66a686c301 Merge pull request #8869 from Ravensdale/supamattah 
Changes SM alerts to Engineering frequency
 2015-04-18 17:44:07 +03:00
Chinsky
3819fe8d03 Merge pull request #8747 from Kelenius/ofJarsAndLizards 
The return of the jars
 2015-04-18 17:01:08 +03:00
PsiOmegaDelta
6c59eb46fe Merge pull request #8878 from Jarcolr/patch-4 
Fixes #8444
 2015-04-18 15:58:00 +02:00
Chinsky
511d3764e7 Merge pull request #8846 from PsiOmegaDelta/CantClickMeDontClickMe 
Makes objects without moues opacity not appear via alt-click.
 2015-04-18 16:57:01 +03:00
Chinsky
9d6ff2f939 Merge pull request #8865 from PsiOmegaDelta/Adminery 
Ensures Admin Delete uses qdel.
 2015-04-18 16:56:40 +03:00
Chinsky
fb34bd361b Merge pull request #8860 from PsiOmegaDelta/SanityChecks 
Ghost-possession sanity checks.
 2015-04-18 16:56:36 +03:00
Chinsky
ead0ffdc29 Merge pull request #8853 from PsiOmegaDelta/ModuleStat 
Adds Hardsuit Module tab.
 2015-04-18 16:56:31 +03:00
PsiOmegaDelta
0b6affb274 Merge pull request #8877 from Jarcolr/patch-3 
Fixes #8559
 2015-04-18 15:55:45 +02:00
Chinsky
bababb05d2 Merge pull request #8887 from PsiOmegaDelta/AdminDeadmanLog 
Threating to and actually using a signaler deadman switch now admin logged.
 2015-04-18 16:55:31 +03:00
Chinsky
2192e3d77e Merge pull request #8881 from PsiOmegaDelta/NanoPDA 
Fixes #8880.
 2015-04-18 16:55:12 +03:00
Chinsky
0d77262c69 Merge pull request #8885 from PsiOmegaDelta/EngineerMasterJob 
Fixes #7943.
 2015-04-18 16:55:06 +03:00
PsiOmega
9ef7aeb940 On join clients are now given a changelog notice, if the changelog has changed since last. 2015-04-18 15:53:23 +02:00
PsiOmega
eca7569077 Clean server start. 
Server start messages concerning initialization, object generation, etc. is now only propagated to users with R_DEBUG access.
 2015-04-18 15:32:25 +02:00
Zuhayr
bc9d1ba38b Merge pull request #8893 from Baystation12/dev-freeze 
Dev freeze into dev
 2015-04-18 21:50:40 +09:30
Zuhayr
c8b9d93d66 Merge pull request #8892 from Baystation12/master 
Master into dev-freeze
 2015-04-18 21:45:41 +09:30
PsiOmega
3edfbf0040 Moves us to the changelog system used by /vg/, /tg/, and others. 
Cleans up the HTLM folder, removing unused files.
Will also attempt include /tg/'s "You have unread changelog entries" notification on join.
 2015-04-18 13:00:28 +02:00
PsiOmega
860fb4946f Threating and actually using a signaler deadman switch now admin logged. 2015-04-18 12:18:14 +02:00
PsiOmega
0e0d13f1b1 Fixes #8490. 
Now properly calls update icon on EMP effect changes.
 2015-04-18 12:01:32 +02:00
PsiOmega
f5948f8bb6 Fixes #7943. 
Access to engineering equipment is now enough to manipulate shield generators.
 2015-04-18 11:52:03 +02:00
PsiOmega
67708c6d3b Fixes #8880. 
Case of incorrectly sent parameter.
 2015-04-18 08:59:49 +02:00