cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-22 08:01:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,890 Commits 2 Branches 1 Tag
810de4ddaa57a2b51a302037382e34c8eb80362a
Commit Graph

6769 Commits

Author SHA1 Message Date
Zuhayr
1e1426fa8a Minor vox sprite fix, added vox to Create Admin verb. 2013-06-14 16:36:55 -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
Zuhayr
753129086e Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-06-14 12:01:56 -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
Zuhayr
4aa577bef3 Powered crossbows, sprites, ammo. 2013-06-13 15:31:47 -07:00
NicholasDV
a2fddc0fc1 Adds in the Kida 
Adds in the Kida Race to all parts.
 2013-06-13 18:22:05 -04:00
Zuhayr
4928f56030 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-13 12:03:58 -07:00
Asanadas
7479fd272c Added Malsquando's colored suit to the hop's wardrobe locker. 
Everything should be working correctly.
 2013-06-13 09:41:52 -04:00
meyar
90e477ebfb Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-06-12 17:24:54 -04:00
meyar
e259deba7c Actually calls the ERT proc on red alert now. Hurr. 2013-06-12 17:23:39 -04: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
Chinsky
634cf4e35f Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into manup 
Conflicts:
	code/modules/admin/admin_verbs.dm
 2013-06-12 23:25:15 +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
b9be0158c7 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-12 20:31:52 -07:00
Zuhayr
fa79834e1b Merge resolution. 2013-06-12 20:31:29 -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
6bd685bcb2 Compilation fix for ERT code. 2013-06-12 12:30:28 -07:00
Zuhayr
7cd54ac387 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-06-12 11:41:08 -07:00
Chinsky
8c23dc60f7 Merge pull request #3046 from meyar/bleeding-edge-freeze 
Emergency Response Team Mega Update! Weee
 2013-06-12 03:21:42 -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
Segrain
81852bea51 Fix-O-Vein steps bugfix. 2013-06-12 14:00:48 +03:00
Zuhayr
b859a494e6 Minor surgery fix. 2013-06-12 01:57:01 -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
Kilakk
bde37882ce Fixed a small spelling error in job prefs 2013-06-11 21:36:40 -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
Kilakk
6c8423aed0 Merge remote-tracking branch 'upstream/bleeding-edge-freeze' into bleeding-edge-freeze 2013-06-11 16:25:42 -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
Zuhayr
c57f2bb137 Polished off some pneumatic cannon bugs. All done. 2013-06-11 12:19:20 -07:00
Furlucis
360bde9f83 Fixed some typos. (feotal, "/red ...") 
Signed-off-by: Furlucis <Logman115@gmail.com>
 2013-06-11 15:01:48 -04:00
Zuhayr
de2b8b8087 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-11 11:51:48 -07: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
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