cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-05-29 18:18:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
12,989 Commits 9 Branches 26 Tags
e259deba7c6769e98efaeddd80afef71d28feec9
Commit Graph

5517 Commits

Author SHA1 Message Date
meyar e259deba7c Actually calls the ERT proc on red alert now. Hurr. 2013-06-12 17:23:39 -04:00
meyar 811fae38fd Missed a line 2013-06-11 16:58:48 -04:00
meyar 7256c9d39f Changes 'Emergency Rescue Team' to its proper 'Emergency Rescue Team' 2013-06-11 16:52:36 -04:00
Chinsky fa2b46ce9c Merge pull request #3035 from CIB/feature 
New configuration option: external resource download
 2013-06-11 12:33:16 -07:00
cib 13b16bcd69 Added extra message when downloading external resources. 2013-06-11 21:28:59 +02:00
cib 4e0c68b88a Added a configuration option that allows putting the .rsc on external servers. 2013-06-11 21:28:59 +02:00
Chinsky bd3879da2e Merge pull request #3040 from Baystation12/master 
hurka durka master update
 2013-06-11 12:25:56 -07:00
Furlucis 360bde9f83 Fixed some typos. (feotal, "/red ...") 
Signed-off-by: Furlucis <Logman115@gmail.com>
 2013-06-11 15:01:48 -04:00
Chinsky 8108dd6416 Merge pull request #2994 from Giacomand/AI_announcement_BEF 
AI voice announcement system. Type in words to create vocal sentences.
 2013-06-11 08:30:55 -07:00
Zuhayr c57f2bb137 Polished off some pneumatic cannon bugs. All done. 2013-06-11 12:19:20 -07:00
Zuhayr de2b8b8087 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-11 11:51:48 -07:00
Zuhayr c8f2ee9326 Removed a debug string. 2013-06-11 01:35:30 -07:00
Zuhayr 045a90167c Vox sprite fixes. 2013-06-11 01:32:07 -07:00
Zuhayr 96d9a41ea7 Pneumatic cannon sprites, gas loss code. 2013-06-11 00:57:15 -07:00
Zuhayr 0fb234d6a4 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-06-10 22:35:42 -07:00
Zuhayr 98d31e9191 Preliminary work for pneumatic cannons (WIP, no sprites, broken gun) 2013-06-10 22:35:01 -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
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
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
Giacomand 8dc07fdb6d * Added a volume constant that defaults to 75. 2013-06-08 05:13:56 +01: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
Giacomand fa39b4e520 New AI voice announcement system which allows the AI to create sentences by combining snippets of words. 2013-06-07 06:29:21 +01: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
jack-fractal f4441b5019 refactoring the Stat function for silicon lifeforms 
adding messenger functions to cyborgs and refactoring the AI's IM system
 2013-06-06 20:46:46 -04:00
Kilakk d1faeac8d8 Adds emergency response team verb 
* Adds a verb for (b)admins in "Special Verbs" that lets you spawn in an
emergency response team a la deathsquid-button
* Spawned-in ERTs can choose their own ridiculous name
* Command alerts, because everyone loves those
 2013-06-06 17:04:49 -04:00
MisterBook eab6f4fc44 Taser fix v.3.2 
Now accounts for multiple layers of armor.

I've also commented out Vox stuff, while Zuhayr fixes it. Because, no compile.

I also fixed whistle.dm
 2013-06-05 19:37:29 -05:00
MisterBook a34174e124 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-06-05 18:39:43 -05:00
Zuhayr 06f04e6374 Vox mutantrace, vox clothing, minor surgery mod for mutantrace specific surgery steps. Fixed captain's jacket sprite. 2013-06-05 17:35:38 +09:30
Zuhayr 9e71180e1b Merge conflict resolution, using BEF. 2013-06-05 14:22:04 +09:30
MisterBook f240edcdb8 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-06-04 22:42:45 -05:00
MisterBook fd8d61aa8b New taser fix is now in place. Rather than full deflection, armor mitigates the damage. Updates along all sorts of Clothing for minor mitigations to major mitigations. 
New define - AGONY. Used as an effect (Like STUN, WEAKN, etc) to cause HALLOSS. Allows use of HALLOSS projectiles without having to worry about them shattering windows/grilles. Future use? Torture tools, pain inducers for interrogation, 'Be Good' modules, Meme, etc.

HALLOSS now regens while standing up (2 per tick), and laying down (Resting, unconscious, paralyzed - 6 per tick). This fixes the 'real damage + HALLOSS = forever crit'.

Sticking a gun in your mouth (Non-stun, damage inducing) and pulling the trigger kills you.

Icon adjustments.
 2013-06-04 22:41:23 -05:00