cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-20 02:27:58 +01:00
Code Issues Packages Projects Releases Wiki Activity
13,073 Commits 9 Branches 26 Tags
b41b1fc2f3c101e83176a7bab53a65b489b526bf
Commit Graph
2969 Commits
Author SHA1 Message Date
Zuhayr b41b1fc2f3 Armalis simple_animal/sprite. 2013-06-15 04:09:49 -07:00
Zuhayr b1cac56e9a Merge resolution. 2013-06-15 03:54:22 -07:00
Zuhayr 04be69a0b4 Magboots and gloves for vox, removed a debug string, tweaked vox. 2013-06-14 20:07:16 -07:00
Zuhayr 52433df154 Runtime fix (argh) and removal of vox from the station race whitelist. 2013-06-14 13:41:06 -07:00
Zuhayr 030290d3a7 Learn to test compile when using new procs, idiot. 2013-06-14 13:25:20 -07:00
Zuhayr 73d35bcd4f Minor changes/sanity checks in yank-out verb. 2013-06-14 13:17:21 -07:00
Zuhayr 7a19d6165b Projectile shrapnel tweak for ease of forensics identification. 2013-06-14 13:03:03 -07:00
Jim "Apples" 6d1d50ed69 Merge pull request #3067 from NicholasDV/enhancementsAndFeatures 
Adds in the Kida
 2013-06-14 10:33:23 -07:00
Jamini 89766706fe Alien Monkeys - Farwa, Stok, Aenera 
Signed-off-by: Jamini <mobiousjami@gmail.com>
 2013-06-14 02:22:27 -04:00
Zuhayr b30b156950 Melee embedding fix. 2013-06-13 22:59:13 -07:00
Zuhayr 3cb36272cb Adjusted yank verb to apply to others as well as yourself. 2013-06-13 22:18:26 -07:00
NicholasDV 9139a70d8c Adds in the icon files for Kidan and fixes issue 
SkyMarshal caught a small issue, and I realized that I never did
include the kidan icon files. This is the fix!
 2013-06-14 00:06:45 -04:00
Zuhayr 6b73b8ec2f Adjusted kitchen knives. Added projectile pinning. Various tweaks. 2013-06-13 20:46:09 -07:00
Zuhayr 1b230504f5 Runtime fix. 2013-06-13 15:57:41 -07:00
NicholasDV a2fddc0fc1 Adds in the Kida 
Adds in the Kida Race to all parts.
 2013-06-13 18:22:05 -04:00
Chinsky bb26c5a7cb Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into newstuff 
Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
 2013-06-12 23:11:28 +04:00
Zuhayr 1c65f32828 Compile fix. 2013-06-12 20:37:45 -07:00
Zuhayr 48aa2bb8f9 Internal damage from yanking out things, damage from moving with shrapnel and things inside your body. 2013-06-12 14:17:05 -07:00
Zuhayr 7cd54ac387 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-06-12 11:41:08 -07:00
Zuhayr 19748b1217 Added verbs for ripping items out of yourself, added examine proc, altered hatchets w_class. 2013-06-12 03:20:23 -07:00
Zuhayr 7db6cd4108 Added shrapnel from projectile wounds and altered scanner readout. 2013-06-12 01:45:07 -07:00
Zuhayr 0a220db976 Added embedded weapons and adjusted implant removal surgery to work with non-implants in organs. 2013-06-12 00:28:12 -07: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 c8f2ee9326 Removed a debug string. 2013-06-11 01:35:30 -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 a252ca3943 Merge pull request #3019 from misterbook/bleeding-edge-freeze 
Bleeding edge freeze
 2013-06-10 02:51:19 -07: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
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 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 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
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
Chinsky 65880df974 Clicking on storage boxes now properly puts stuff in storage. 
Stole fix from TG.
 2013-06-05 19:43:01 +04: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