cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,965 Commits 5 Branches 0 Tags
e41c47c52b663f99dca16f7e7857802d5e40e5a2
Commit Graph

9803 Commits

Author SHA1 Message Date
Zuhayr
e41c47c52b Fixes #3082. 2013-06-19 00:21:15 -07:00
SkyMarshal
453c0c741c Air alarm improvements. Adds Central Atmos Control and a buffer between server room and station. 
Fixes #3074
Fixes #3069
Fixes #2909
 2013-06-17 15:56:57 -07:00
Chinsky
5993ce4be5 Merge pull request #3068 from SkyMarshal/airfixes 
Fixes a runtime involving ZAS zones lose their air datum.  (I have no fucking idea why that happens)
 2013-06-14 02:59:29 -07:00
SkyMarshal
1f886448b6 Fixes a runtime involving ZAS zones lose their air datum. (I have no fucking idea why that happens) 
Fixes #3059
 2013-06-13 18:20:42 -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
Chinsky
e638540b4c Merge pull request #3041 from meyar/master 
Emergency map fix: Security escape pod
 2013-06-11 12:29:41 -07:00
meyar
f03f8c9b66 Disables debug(poorly made debug) verb for ERT. This -may- be behind my BEF fix, but I suck at git and can't exclude this because I am dumb :c 2013-06-11 15:25:59 -04:00
Chinsky
09d0bb7f8e Merge pull request #3039 from Furlucis/master 
Typo fixes
 2013-06-11 12:21:16 -07:00
Spamcat
076f4c9d9a Figured I should finally commit it, since exams are over now~ 
Radios start off by default. Should decrease the amount of tcomm lag.
 2013-06-11 23:09:44 +04:00
Furlucis
360bde9f83 Fixed some typos. (feotal, "/red ...") 
Signed-off-by: Furlucis <Logman115@gmail.com>
 2013-06-11 15:01:48 -04:00
meyar
38feb46839 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-11 15:00:22 -04:00
Furlucis
a60dcf473b Fixed a runtime error where one thing would sometimes try to handle an empty list. Some chance that will still make a jungle map fail to work right, though. 
Signed-off-by: Furlucis <Logman115@gmail.com>
 2013-06-11 03:18:03 -04:00
SkyMarshal
1739ff6fec God, I am not awake. 2013-06-10 19:40:39 -07:00
SkyMarshal
df73aabf83 Fixes for ZAS issues. 
Fixes #2996
Fixes #3023
 2013-06-10 18:49:41 -07: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
Zuhayr
38b44b2441 Items for wizard den, mental focus added to spellbook. 2013-06-10 14:56:47 -07:00
Zuhayr
85b945cfbf Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-10 14:42:46 -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
NicholasDV
af234f7f1d Removes a few typos from channel names 
The literal only two instance of gazette in the code.
This should fix it entirely.

fixes #3006
 2013-06-09 18:04:27 -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
eaf6b64277 Compile fix. 2013-06-09 19:53:08 +04:00
NicholasDV
f304df5b05 Added the ability to give traitors all objectives. 
Specifically, admins were unable to give players, traitors,
that is, the objective to brig/maim someone. This gives them
the ability view the traitor panel.
 2013-06-09 04:47:10 -04:00
NicholasDV
adde619a06 Fixes an issue in grammar! 
Specifically, the way that it was coded made it so that the word
the would appear twice. There... really wasn't a way to fix that
in a way that would effect a lot more things, that I could find.
As a result, I simply reworded it so that it can work with or without
the word, 'the'.

closes #2771
 2013-06-09 03:40:27 -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
Segrain
673f3ddb37 Fix for ordering hidden supplypacks. 2013-06-09 10:25:27 +03:00
NicholasDV
f2a16fc3cd This just fixes a small typo in build mode. 
Specifically, the throw and select buttons were 'switched'
in some instructions. This quickly fixes that!

closes #3001
 2013-06-09 03:16:51 -04:00
NicholasDV
d5c085e22a Changes to increase readability 
Specifically formatting the messages a bit differently by putting
them onto multiple lines. They line up properly inside of dream
maker, making them /much/ more readable. This format would be preferable
for new additions into this file.
 2013-06-09 03:00:47 -04:00
meyar
128326ad1f Fixes Spec Op shuttle to old behavior (Pure port, no changes) 2013-06-09 01:03:09 -04:00
meyar
5e4b9ae917 Fixes autonomous ERT 2013-06-09 01:02:48 -04: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
cib
8c6b8add20 Weights the likelihood of command positions by your age. 
For most head positions, a good age is between 25 and 60, with ages towards the middle of that being even better. 25 because I figure for stuff like research, engineer etc. they'll want someone with fresh knowledge. Captain's best age starts at 35 though, due to that being an "old geezer job".
 2013-06-09 01:13:13 +02:00
Kilakk
5ca6c970fb Reticked and uncommented ERT 
It's time
 2013-06-08 18:52:41 -04:00
Kilakk
a5609c8150 Adds ability to change appearance for ERTs 
* ERTs can change their own appearance
* Fixed an if statement I goof'd
 2013-06-08 18:51:26 -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
Chinsky
4118d183c1 No fun allowed. 
Fixes some hilarious stool glitches.
 2013-06-08 05:27:32 +04: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