cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-04 19:54:04 +01:00
Code Issues Packages Projects Releases Wiki Activity
22,199 Commits 9 Branches 2 Tags
355666e1a825252a4d08fa4e5cfced85e107ce39
Commit Graph

5039 Commits

Author SHA1 Message Date
jupotter f8458f13f4 Fix robotics on char setup screen 
Robotics is no longer in engineering, but in medsci
 2013-06-21 17:29:37 +02:00
Zuhayr 7389d843fc Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-21 18:06:49 -07:00
Zuhayr a16c8e0595 Fixes #3081 2013-06-21 18:00:25 -07:00
Zuhayr 1b5b035630 Fixes #2421 2013-06-21 15:38:44 -07:00
Chinsky 960a22ee43 Changes way viruses are stored in mobs. 
Now it's an associative list:
uniqueID - virus datum

Updated most instances to match it.
 2013-06-19 02:28:53 +04:00
Segrain 9a59c967f1 Cyborg update. 2013-06-18 23:49:40 +03:00
Zuhayr 35b909ef3b Fix for dragging. 2013-06-18 23:39:48 -07:00
Zuhayr 63b3e44b5c Bug fixes for embedding/pinning code. 2013-06-18 21:24:26 -07:00
Chinsky cb7daa77a6 Merge branch 'bleeding-edge-freeze' into viro 2013-06-18 14:55:59 +04:00
Zuhayr 8f7d2c2c7d Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-06-17 18:14:23 -07:00
Zuhayr 23c8ae0281 Adjustment to melee weapon embedding, so that axes don't instantly get ripped out of your hands in combat. 2013-06-16 22:33:12 -07:00
Zuhayr 94c3c7ef49 Armalis additions, tweaks. 2013-06-16 13:17:20 -07:00
Kilakk 13045af61a Adds a crew transfer notice for new players 
Adds the "The station is currently undergoing evacuation procedures"
notice for new people trying to join when there's a crew transfer going
on.
 2013-06-16 12:38:38 -04:00
Zuhayr b7c260d6ea Removed some debug strings. 2013-06-16 00:45:03 -07:00
Zuhayr 23299809f6 Armalis sprites, simple animal/mob yank-out verb and embedding. 2013-06-16 00:38:40 -07:00
Chinsky fd13ff0d64 Merge branch 'vials' into viro 2013-06-16 11:22:15 +04:00
Chinsky 5ef5a17701 Merge pull request #3064 from Zuhayr/master 
Projectile pinning, staggering, vox whitelist removal, vox raider spawn verb.
 2013-06-15 00:21:24 -07:00
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
MisterBook 4ea1e16863 With a brand new spanking BEF pull. 2013-06-14 21:24:28 -05:00
Jim "Apples 9b4841143e Merge pull request #3067 from NicholasDV/enhancementsAndFeatures 
Adds in the Kida
 2013-06-14 21:06:37 -05: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