cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-25 17:42:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,573 Commits 2 Branches 1 Tag
d38cf3da27b87ef4e51cc8e89e7b29def53a1648
Commit Graph

3977 Commits

Author SHA1 Message Date
Cael_Aislinn
d38cf3da27 re-enabled alien player's hair and facial hair 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-15 21:43:40 +10:00
Cael_Aislinn
e00a696a40 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 2012-10-15 20:57:54 +10:00
Asanadas
840ed30875 Fixed a spelling error in the Jensen HoS coat. Sponsored by tasty Trenchoats. 
Signed-off-by: Asanadas <asanadas@hotmail.com>
 2012-10-14 15:04:00 -04:00
Cael_Aislinn
d5a4a268d7 moved mod panel to a new file, removed the admin stuff from it 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-14 14:31:45 +10:00
Cael_Aislinn
4e08f61642 made the alien player limit a config option 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-14 13:59:50 +10:00
headswe
10f32d1351 Merge pull request #1760 from DarkTechnomancer/master 
Fixed flavor text
 2012-10-13 20:10:18 -07:00
DarkTechnomancer
4bf6833a62 Fixed flavor text 2012-10-13 19:27:43 -04:00
headswe
c04c26fa29 Merge pull request #1759 from headswe/master 
Fixed Organspam (Maybe)
 2012-10-13 15:44:42 -07:00
Head
085d357b4b Hopefully fixed organ spam. 2012-10-14 00:43:23 +02:00
cib
415e1c47d9 Made nudge.py script location configurable. 2012-10-13 11:11:57 -07:00
cib
c747e5e56e Chloral hydrate and sleep toxin now have a small delay before taking effect. 2012-10-13 10:51:08 -07:00
cib
160328741e Made the human/drip() proc produce larger pools. 2012-10-13 10:08:12 -07:00
cib
31093ce666 More messages for low blood. 2012-10-13 09:59:17 -07:00
cib
e77afd5ab9 Added bleeding and blood transfusion. 2012-10-13 09:45:33 -07:00
cib
4f1d301880 Examine now only reveals you're dead by checking pulse. 2012-10-13 08:57:03 -07:00
cib
46f2864cd3 Ported BS12 player info system. 2012-10-13 08:34:45 -07:00
headswe
2326abe31b Merge pull request #1754 from Whitellama/master 
Ports/Fixes for the merge!
 2012-10-13 07:00:40 -07:00
cib
98386354bb Fixed a bug in radio code where it would expect the user to be a human. 2012-10-13 06:37:18 -07:00
cib
9c55f8c8ac Ported BS12 medbots. 2012-10-13 06:33:05 -07:00
cib
8dc75dfa3c Fixed the problem where :h would be holosay even for cyborgs. 2012-10-13 05:46:09 -07:00
Travis Whitehead
5184ca58f5 Roller beds are collapsible and the ChemMaster lets you specify pill/bottle color, once more 2012-10-13 03:44:19 -07:00
Travis Whitehead
524265b872 Fixed Moderator text color in OOC + Mods no longer see admin logs 2012-10-13 03:39:33 -07:00
cib
9ae4bbfdf8 Fixes the say_quote runtime. 2012-10-12 16:15:34 -07:00
cib
c0e0e7d116 Remove the silly examine messages that give away wounds even when under clothing. 2012-10-12 15:47:01 -07:00
cib
c691f76c65 Small bug with engineering cyborg radio channels. 2012-10-12 15:34:40 -07:00
cib
e05b9fa2b6 Fixed a runtime with organ generation. 2012-10-12 15:03:32 -07:00
cib
06d47ea2dd Cyborgs can now use their respective channel. 2012-10-12 14:56:34 -07:00
cib
32e839f683 More and yet more fixes from the piratepad. 
- AI laws now default to Nanotrasen laws
- Removed half the random events
- Milk now in chem dispensers
- Hunger rate decreased by half
 2012-10-12 14:25:54 -07:00
cib
89263fc9f6 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-10-12 13:19:20 -07:00
cib
8c157bff18 Added missing groin. 2012-10-12 12:36:25 -07:00
Mloc
046348db49 Merge pull request #1744 from CIB/branch 
Several changes to organs + bugfix
 2012-10-12 12:15:57 -07:00
cib
99313f5a94 More fixes to wounds. 
- Added more wound descriptions
- Wounds now have "bleeding" and "bandaged" in their examine description
 2012-10-12 12:08:00 -07:00
cib
0aa3bde885 Fixed the problem where you don't get the game-panel verb. 2012-10-12 11:41:01 -07:00
Mloc
d4a67a7e66 Merge pull request #1741 from caelaislinn/bs12_with_tgport 
re-add asay >.>
 2012-10-12 09:43:08 -07:00
Mloc
33a3d3cd97 Merge pull request #1738 from CIB/master 
Dismemberment
 2012-10-12 09:42:31 -07:00
Cael_Aislinn
d59dc63fed re-add asay >.> 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-13 01:37:08 +10:00
Cael_Aislinn
a0c91e200d re-added missing admin verbs (bans, toggle ooc, msay etc) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-13 00:51:30 +10:00
Cael_Aislinn
3e11992cce re-added game panel for admins and added zas options, extended postgame restart delay from 25 seconds to 60 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-13 00:01:45 +10:00
Cael_Aislinn
6d4e17ac32 fix for alien species limiter bug 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-12 23:36:10 +10:00
Cael_Aislinn
6fc9aab4f6 some merge fixes 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-12 18:21:50 +10:00
Cael_Aislinn
419247adfe Merge remote-tracking branch 'remotes/git-svn' 4847 into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/game/verbs/ooc.dm
	code/modules/admin/admin_verbs.dm
	code/modules/food/recipes_microwave.dm
	html/changelog.html

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-12 17:53:17 +10:00
Cael_Aislinn
33e12ca9d3 readded speech bubbles, tested on humans only. also pre-emptively fixed (?) a bug with alien languages 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-12 17:43:21 +10:00
Cael_Aislinn
39f528e0ce re-enabled custom event verb 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-12 16:49:59 +10:00
Cael_Aislinn
79ad144e91 fix^2 for mods and admins not being applied correctly, along with the admin/player panel not showing up 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-12 16:39:26 +10:00
Kortgstation@gmail.com
29fe7720ca Committing my mostly finished away mission. 
Added a few new corpse types

Simple animals can now open doors

Added a bluespace artillery control machine. Using PA sprites as placeholders until I get real ones.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4847 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-12 06:05:52 +00:00
Cael_Aislinn
fed6625e07 fix for moderators not being loaded correctly 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-12 13:44:23 +10:00
giacomand@gmail.com
5eba2eda1d -Added a new Game Master fun button. It will set the default player OOC colour to whatever the user chooses. 
http://i.imgur.com/xRM7j.png

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4845 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-11 22:24:08 +00:00
cib
fb60301594 Revert "Revert's cib's BS12 merge by XSI's orders" 
This reverts commit a6e7c085ef.

Conflicts:

	baystation12.dme
	code/datums/organs/organ_external.dm
	code/game/gamemodes/events/ninja_equipment.dm
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/mob/living/carbon/human/hud.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_defines.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/mob_defines.dm
	code/setup.dm
	icons/mob/dam_human.dmi
	icons/mob/human.dmi
 2012-10-11 14:31:31 -07:00
giacomand@gmail.com
5a93673762 -Larva grow a little faster (an extra growth per life) when on weeds or when breathing in plasma. 
-Observer following is cancelled when there's no client.
-Made facehuggers/eggs a little smarter. They won't try to go after people with masks covering their mouths (as that kills them), however when they're thrown they will still try to attach to the person.
-Improved alien stats(). You'll be able to see the max plasma and larva will see the escape shuttle.
-Blessing with a fire extinguisher wasn't working because of the volume check. Removed the check.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4842 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-10 19:56:51 +00:00
d_h2005@yahoo.com
4d74a9f252 -Adds cherry seeds to the seed vendor 
-Adds some recipes for cherries and cherry jelly
-Standardizes the vendor's seed count to 3 for all (though the plants that make you high starting with more seeds than everything else was a humorous commentary). 
-New sprites for eggplants/seeds!!!
-Making ambrosia salads removes the toxin from them now. 

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4841 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-09 21:54:36 +00:00