cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-12 18:33:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,781 Commits 2 Branches 1 Tag
77832af5ae197358384eb392a2fa3b1165c81dc8
Commit Graph

5438 Commits

Author SHA1 Message Date
Mloc
77832af5ae Merge pull request #2940 from comma/whistle 
Whistle
 2013-06-01 07:45:56 -07:00
Chinsky
88f5a2a3b5 Added this sound as emote to borgs. 2013-06-01 17:20:13 +04:00
Chinsky
3bbb250749 Added bloody footprints. 2013-06-01 14:30:05 +04:00
Chinsky
89fff29db1 Showed that huge proc in /atom what polymorphism' is. 
Now instead of huge condition line it's handled where it was supposed to be handled.
 2013-06-01 12:24:43 +04:00
Chinsky
0b9c904252 DRY BLOOD FOR THE BLOOD GOD. 
Blood will now dry up in around half an hour.

Also moved blood drip define out of disposals. WTF.
 2013-06-01 10:56:59 +04:00
Chinsky
5de37def3d Moved blood compatibility check to the related file. 2013-06-01 09:08:45 +04:00
Chinsky
b2aeed8fba Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-06-01 08:26:43 +04:00
Chinsky
4749d6016d Made syringe gun work with aiming system. 2013-06-01 08:23:38 +04:00
Asanadas
2d6bb6a768 Merge pull request #2934 from Baystation12/master 
Bleeding Edge gonna bleed.
 2013-05-31 21:12:37 -07:00
MisterBook
606a510168 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	html/changelog.html
 2013-05-31 22:58:01 -05:00
Chinsky
4794fc4d1e Merge pull request #2933 from Furlucis/master 
Fixes and tweaks for Obscure, Reveal and Seer runes, plus some amount of floundering around with git
 2013-05-31 20:09:10 -07:00
Chinsky
de4f4e4788 Merge pull request #2927 from Baystation12/master 
Merging master to BEF
 2013-05-31 19:49:13 -07:00
Chinsky
e630d11cea Merge branch 'master' into bleeding-edge-freeze 2013-06-01 04:35:30 +04:00
Chinsky
1030ddd8db Whoopsie! 
So awkward.
 2013-06-01 04:34:04 +04:00
Chinsky
b91cf84993 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-01 04:18:43 +04:00
Chinsky
793f472a4f Should fix quite a few of false positives on gun targeting. 
Allows mob to click on turfs with empty hand.
 2013-06-01 04:11:16 +04:00
Chinsky
1a51aefaac Fixes #2922 
Putting gun away now properly lowers aim.
Prevents gun from going off if it's not in active hand.
 2013-06-01 04:05:33 +04:00
Furlucis
e32b253a41 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-05-31 20:01:57 -04:00
Furlucis
0f9a1fe71c Fixes and a few tweaks to Obscure, Seer, and Reveal runes. 
Signed-off-by: Furlucis <Logman115@gmail.com>
 2013-05-31 19:42:27 -04:00
MisterBook
25d5600d19 Cobpipe fix 
Smoking pipe icon fix.
Eye-stab admin logging fix.

Tasers now do halloss, representing non-lethal PAIN.
http://baystation12.net/forums/viewtopic.php?f=5&t=7773

Tasers now check their target's limb for armor, and deflect if armored (Represented by coeffecient = 0).
http://baystation12.net/forums/viewtopic.php?f=5&t=7772

Attempting to merge with BEF
 2013-05-31 00:21:48 -05:00
MisterBook
06b7700086 Cobpipe fix 
Smoking pipe icon fix.
Eye-stab admin logging fix.

Tasers now do halloss, representing non-lethal PAIN.
http://baystation12.net/forums/viewtopic.php?f=5&t=7773

Tasers now check their target's limb for armor, and deflect if armored (Represented by coeffecient = 0).
http://baystation12.net/forums/viewtopic.php?f=5&t=7772
 2013-05-31 00:09:00 -05:00
Segrain
312ece670d Meteor shower fix. 
Meteor shower actually processes tick() between starting and ending, thus spawning meteors as it is supposed to.
 2013-05-30 19:26:53 +03:00
jupotter
0cc16379ec Do not let a mind in a posibrain if not searching 
Should fix the robot split-personality bug
 2013-05-30 13:55:44 +02:00
MagmaRam
db07fd16fd Fixes an issue where an uzi could not be reloaded, they can now be reloaded with boxes of .45 bullets. 2013-05-30 18:54:31 +07:00
jupotter
73a9958f29 Do not change both key and ckey 
Changing both the key and the ckey causes issues #2856 and #2803
 2013-05-30 13:51:40 +02:00
Andrew Carroll
97836acb56 Add station time to AI, new_player Status tab 2013-05-30 04:38:18 -04:00
Chinsky
1f2e3b068e Merge pull request #2899 from Roaper/master 
Yeah. Here.
 2013-05-29 21:01:19 -07:00
Mloc
4eb113341d Merge pull request #2871 from ciiol/bs-rtag 
Fix radio keys localization.
 2013-05-29 14:26:03 -07:00
Roaper
ec8a39b45e Added more useless fluff 2013-05-29 14:12:12 -07:00
Erthilo
3312490691 Merge branch 'master' of git://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	maps/tgstation.2.1.0.0.1.dmm
 2013-05-29 11:22:40 +01:00
MagmaRam
e4c913fad9 Fix for issue #2882 in Baystation12/master (CR-20 not updating sprite correctly when unloaded by in-hand click). 2013-05-29 13:34:54 +07:00
Chinsky
40e63cbe32 Merge pull request #2885 from Ravensdale/master 
Cyborg sprites
 2013-05-28 22:17:13 -07:00
VitrescentTortoise
d7fb1f81ca Fixed xenoarchaeology picksets not being able to hold everything they start with. 2013-05-28 19:58:42 -07:00
Erthilo
01ef589293 Fixes everyone being able to understand everyone else. 2013-05-28 23:53:49 +01:00
Ravensdale
62e43f2abf re-adding an accidentally deleted line 2013-05-28 12:07:22 -07:00
Jim "Apples"
b80ae68cc5 Merge pull request #2883 from CIB/master 
Re-buff even timer
 2013-05-28 11:49:25 -07:00
Ravensdale
b42aa26c1a Gives more sprites for cyborgs to use. 2013-05-28 11:13:33 -07:00
cib
a9d4d86ed9 Event balance fixes. 
- Engineering events now less likely
- Radiation storm now less likely
- Halved radiation given by radiation storm.
 2013-05-28 20:03:26 +02:00
Chinsky
d2179f4252 Merge pull request #2875 from CIB/medical_events 
Fixed issue #2689
 2013-05-27 12:04:19 -07:00
cib
c5dc8ebecf Triped time you have to get into maintenance. 
Also re-added sound at start of event. It doesn't fit, but it's better than nothing. Quit complaining already.
 2013-05-27 20:01:37 +02:00
Ciiol
e7127b8343 Fix radio keys localization. 
Add cyrillic analogs of xeno language keys, just as other channel prefixes.
 2013-05-27 16:34:39 +06:00
VitrescentTortoise
83b5dea0a4 Merge with BEF 2013-05-26 19:23:27 -07:00
VitrescentTortoise
aa68ac375a Edited changelog, made small edit. 2013-05-26 19:00:55 -07:00
VitrescentTortoise
d0d51222e1 Allows players to return to lobby if job prefernces unavailable 2013-05-26 18:18:41 -07:00
Mloc
5f580c8417 Merge pull request #2855 from VitrescentTortoise/bleeding-edge-freeze 
Resizes lobby manifest window & Cult chant edit
 2013-05-26 14:57:33 -07:00
Mloc
b4743bef26 Merge pull request #2865 from CIB/medical_events 
Fixed various medical events.
 2013-05-26 14:56:53 -07:00
cib
cbbe291a5d Fixed various medical events. 2013-05-26 23:21:08 +02:00
cib
dbe960a571 Buffed event delay a bit again. 2013-05-26 22:16:11 +02:00
Mloc
3d21ec7f5a Merge pull request #2834 from comma/tentacles 
Tentacles
 2013-05-26 11:49:38 -07:00
cib
cab1289511 Merge branch 'master' of github.com:Baystation12/Baystation12 
Conflicts:
	html/changelog.html
 2013-05-26 20:43:22 +02:00