cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,022 Commits 6 Branches 0 Tags
cf4bd39f6e025757da4a019d8c3fcdff76d3ce5d
Commit Graph

5525 Commits

Author SHA1 Message Date
Mloc-Argent
cf4bd39f6e Updated the linkage between the NanoTrasen IRC bot and the server. 
- Server will now send adminhelps to the admin channel, with information if there is no admins online.
- Server will inform the admin channel if the last admin online logs out.
- When a round ends, the server will alert the main channel, supplying some statistics.
Additionally, laid the groundwork for an external scripts system.
This is fully configurable/togglable in the config.txt file.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-02 23:41:40 +01:00
Zuhayr
6f207a3a14 Fixes #2424 2013-06-27 18:09:48 -07:00
Segrain
fa0e14652a Revive bugfix. 2013-06-27 02:20:19 +03:00
Zuhayr
6d46297757 Fixes #2947 2013-06-27 07:17:55 -07:00
Zuhayr
8eec1d5379 Fixes #3008 2013-06-27 06:30:17 -07:00
Zuhayr
b270c6060d Fixes #3025 2013-06-27 06:22:01 -07:00
Zuhayr
333e59190c Added minimum damage for cutting wounds to bleed visibly. 2013-06-27 02:09:36 -07:00
Segrain
a944cda68e Autopsy fix. 2013-06-26 16:12:32 +03:00
Zuhayr
479d7a058f Fixes #3154 2013-06-25 14:07:54 -07:00
Zuhayr
59119fea07 Fixes #3146 2013-06-24 22:09:03 -07:00
Zuhayr
cfcc3dc689 Merge pull request #3134 from caelaislinn/master 
Xenoarchaeology tweaks
 2013-06-22 21:58:55 -07:00
Cael Aislinn
de91fba835 halved the length of xenoarch scans, scans actually shut down when they exceed the safety by too much 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2013-06-23 10:27:48 +10:00
Cael Aislinn
73cf13745d depth scanner should now properly show the responsive material of a find 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2013-06-23 10:25:41 +10:00
Cael Aislinn
6ccaae583f excavation gear belts can now hold pick sets, pick sets can no longer hold hand picks (they spawn in the locker instead), picks and measuring tapes now work much faster 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2013-06-23 10:25:16 +10:00
Chinsky
6e09f90a24 Merge pull request #3127 from SkyMarshal/master 
Maploader improved: Now loads faster by skipping space tiles and properly parses lists from the mapfile.
 2013-06-22 07:21:58 -07:00
Chinsky
7e19adb045 Merge pull request #3129 from Zuhayr/master 
Various fixes.
 2013-06-22 07:15:58 -07:00
Zuhayr
f77d208d04 Fixes #3131 2013-06-22 22:19:52 -07:00
Zuhayr
146462cbc6 Fixes #2740 2013-06-22 21:55:22 -07:00
Zuhayr
513a9d7ee8 Fixes #3052 2013-06-22 20:22:19 -07:00
Segrain
618da8a7c4 Alcohol bugfixes. 2013-06-22 07:33:33 +03:00
SkyMarshal
9591c3773e Maploader improvements: Now skips space tiles, properly parses lists, commented and cleaned up. 
beach.dmm is now unescapable.
Fixes #3114
 2013-06-21 20:14:11 -07:00
Zuhayr
1b5b035630 Fixes #2421 2013-06-21 15:38:44 -07:00
Zuhayr
e41c47c52b Fixes #3082. 2013-06-19 00:21:15 -07:00
Mordeth221
91bd0d453b Cyborg Medical Hypo Changing Doctors Delight to Tricordrazine 
Changing because they have the same effect, yet Doctors Delight causes people to get drunk/slurr words.
 2013-06-12 21:55:07 +02:00
Segrain
81852bea51 Fix-O-Vein steps bugfix. 2013-06-12 14:00:48 +03:00
Furlucis
360bde9f83 Fixed some typos. (feotal, "/red ...") 
Signed-off-by: Furlucis <Logman115@gmail.com>
 2013-06-11 15:01:48 -04:00
Chinsky
6dc2d9d2dc Merge pull request #3015 from comma/master 
Fix
 2013-06-10 11:50:50 -07:00
Chinsky
a252ca3943 Merge pull request #3019 from misterbook/bleeding-edge-freeze 
Bleeding edge freeze
 2013-06-10 02:51:19 -07:00
Chinsky
0f9b53ef09 Merge pull request #3016 from NicholasDV/tweaksAndFixes 
Tweaks and fixes
 2013-06-10 02:39:40 -07:00
Zuhayr
cbb36ce24f Added ability for tanks to be held on vox suits. 2013-06-10 18:08:25 -07:00
Zuhayr
630db203f9 Oxygen toxicity fix. Whoops. 2013-06-10 17:50:15 -07:00
Zuhayr
bc2db268cc Vox oxygen toxicity, vox breath mask, nitrogen tank for spawning. 2013-06-10 17:16:54 -07:00
NicholasDV
0b20496f7d Adds Uranium Capability to Circuit Imprinters 
Well, looking over the RUST circuits... They required uranium
which we didn't even have implemented in the code to work with
circuit imprinters. I considered simply changing them to use
a different resource, but it honestly makes more sense to improve
the current code to have it more versatile-- To this end, I've made
circuit imprinters capable of using uranium.

As a further note...

closes #2757
 2013-06-10 00:12:28 -04:00
MisterBook
b51bc5e322 Response Team still isn't ticked on. Dunno if it's ready. Re-re-uncommented. 2013-06-09 14:26:34 -05:00
MisterBook
a7b5bee81b Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-06-09 14:11:28 -05:00
MisterBook
b835ab4bd2 Fix of breacher chasis to keep anyone but Ughanti from wearing it. 
Fix of gun suicide - lethal is lethal, nonlethal just hurts like a mother.
Despamming electrode resistance.
 2013-06-09 14:10:11 -05:00
Chinsky
b50216cec6 Fixes #3017 
Looks like will have to put speshul check back...
 2013-06-09 19:54:43 +04:00
Chinsky
7076db3caf Merge pull request #3011 from Kilakk/bleeding-edge-freeze 
ERTs can change their appearance upon spawn-in
 2013-06-09 00:30:53 -07:00
Zuhayr
8b518f5639 Sprites and equipment for a psychic villain wizard variant. Mental focus is fairly experimental. 2013-06-08 19:20:02 -07:00
Kilakk
5ca6c970fb Reticked and uncommented ERT 
It's time
 2013-06-08 18:52:41 -04:00
Chinsky
7b0c4c85e8 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	html/changelog.html
	maps/tgstation.2.1.0.0.1.dmm
 2013-06-08 07:59:57 +04:00
Chinsky
e40140be03 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	html/changelog.html
	maps/tgstation.2.1.0.0.1.dmm
 2013-06-08 05:55:42 +04:00
Chinsky
0c6f518422 Merge pull request #2990 from jack-fractal/bleeding-edge-freeze 
Android Clocks and Instant Messengers
 2013-06-07 18:30:55 -07:00
MisterBook
99e2afb6bc Response team is unticked? Dunno if it's ready or not, but will not commit while that verb is live. 2013-06-07 12:45:02 -05:00
MisterBook
b168f684bf Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-06-07 12:32:52 -05:00
MisterBook
e05a20ad6f Putting VOX back in. 2013-06-07 12:31:38 -05:00
Chinsky
76d1ddaa26 Merge pull request #2963 from Ravensdale/master 
Robot bug fix, synthetic custom sprites update and a rune text tweak
 2013-06-07 04:45:00 -07:00
jack-fractal
29bffb0c20 Merge branch 'master' into bleeding-edge-freeze 
Conflicts:
	html/changelog.html
 2013-06-06 21:32:08 -04:00
MisterBook
05083f4f48 Creating parent class for swimsuits. 2013-06-06 20:24:25 -05:00
MisterBook
8e401489e7 Making sure I don't break anyone else calling apply_effects. 2013-06-06 19:50:32 -05:00