cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-20 15:12:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,790 Commits 2 Branches 1 Tag
a4e5bad4098b901bab0594fccf921ebaf831e4fe
Commit Graph

6279 Commits

Author SHA1 Message Date
n3ophyt3
e4afa60af2 Accidentally removed a line when I was fixing gun recharge rates. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2616 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-04 21:40:31 +00:00
baloh.matevz
962919f6e0 - Added the ability to communications computers to switch between the blue and green security levels. I wanna make a super special way to get to the red level, which involves the turning of multiple keys (id cards) in multiple areas :) 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2615 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-04 20:32:30 +00:00
Tastyfish
c208332942 added Anchorshag's examination flavor text thingy 2011-12-04 15:26:46 -05:00
Miniature
5b15848a07 Made pAIs tell candidates who is requesting. 2011-12-05 04:13:17 +10:30
Miniature
a3e7e394ad Switched charge amounts for automatically turning off machinery and lights, so lights turn off before machinery (like on old code). 2011-12-04 22:52:20 +10:30
baloh.matevz
793d4051e2 security levels commit oddities fixed. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2611 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-04 10:25:03 +00:00
uhangi@gmail.com
02132f4ebf Added grenade launcher, one in the armory with the rest of the riot gear. Capable of holding three grenades at a time. Also, one box of flashbangs in Security, another in the firing range, and two extra pairs of glasses (not HUDglasses) in the firing range. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2609 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-04 09:47:19 +00:00
baloh.matevz@gmail.com
9375c09666 security levels commit 1 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2606 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-04 06:49:59 +00:00
Tastyfish
bba8104f38 Merge remote-tracking branch 'upstream/master' 2011-12-03 23:33:43 -05:00
Tastyfish
901d7c74af gave trashbags to janiborgs, beep/buzz emotes, removed abstract charge class from order list 2011-12-03 23:26:56 -05:00
baloh.matevz@gmail.com
e05f78831e Added the r-glass recipe for the mining furnace. I actually thought it was there all along. rglass = sand + iron ore. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2603 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-04 03:28:30 +00:00
baloh.matevz@gmail.com
f9badcefe1 It is no longer possible to make reinforced metal from metal sheets or vice versa. The reason for this is on Pete's side. The intention is to make RCD's not able to take down r-walls, however at the same time make r-walls harder to make. 
The way you make reinforced metal now is by using the mining processing unit. The recipe is a combination of metal and plasma ore.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2601 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-04 03:05:44 +00:00
headswe
1392f1100f Merge pull request #59 from Tastyfish/master 
made set-observe not make the mob pass out
 2011-12-03 15:11:07 -08:00
Tastyfish
772da9b506 made set-observe not make the mob pass out 2011-12-03 16:55:26 -05:00
petethegoat@gmail.com
c6d94edb84 Fixed up some of the APC construction/deconstruction messages. 
Changed the popcorn sprite to one that doesn't suck, by Cheridan.
Updated dat changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2596 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-03 17:26:16 +00:00
Miniature
2159409d53 Merge branch 'master' of git://github.com/Baystation12/Baystation12 
Conflicts:
	code/game/vote.dm

Because I did it derpily.
 2011-12-03 19:30:28 +10:30
Miniature
f62eccc76b Merge branch 'master' of git://github.com/Abi79/tgstation13-git 
Conflicts:
	baystation12.dme
	code/defines/mob/mob.dm
	code/defines/obj/vending.dm
	code/game/atom_procs.dm
	code/game/dna.dm
	code/game/machinery/computer/aifixer.dm
	code/game/vote.dm
	code/modules/chemical/Chemistry-Machinery.dm
	code/modules/chemical/Chemistry-Reagents.dm
	code/modules/mob/living/carbon/metroid/life.dm
	html/changelog.html
	icons/obj/stationobjs.dmi
	interface/skin.dmf
	maps/tgstation.2.0.8.dmm
 2011-12-03 19:28:10 +10:30
Tastyfish
8c596e5c53 added sleeping on logout, willful sleeping, custom event message, slots 2011-12-02 17:28:24 -05:00
CompactNinja
79e8ad760b AI icon stuff from old code. Also fixed some of Mini's derping. 
Signed-off-by: CompactNinja <kulzernite@hotmail.com>
 2011-12-02 21:18:29 +10:30
CompactNinja
e2f4d44cbd Added old cyborg module sprites. Cyborgs can now select multiple styles, if there are multiple styles to select from. 
Signed-off-by: CompactNinja <kulzernite@hotmail.com>
 2011-12-02 19:59:11 +10:30
ryantennessee@yahoo.com
ac581158ca Moved 2 borg chargers from robotics to the maint hallways outside security and medical. Changed around borg module order to make it easier to pick things. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2590 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-02 08:00:16 +00:00
n3ophyt3
b8abae2eba Fixed the recharge rates on the captain's laser, energy crossbow, and advanced energy gun. 
pulse rifles can once again switch between stun, kill, and destroy (outside of the pulse destroyer, which has three settings, and they are all destroy)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2588 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-02 00:33:21 +00:00
LastBattaWolf@hotmail.com
b00324f430 fix for issue 224 by quarxink desu 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2586 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-01 21:56:08 +00:00
petethegoat@gmail.com
a80e46c078 Fixed issue 222. 
Improved closet/secure closet/crate code a bit. (Updated the paths on the map.)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2585 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-01 20:02:43 +00:00
Tastyfish
fc5097929e Fixed 3+ character slots bug 2011-11-30 23:34:23 -05:00
Tastyfish
0b28c04e8c Nanotrasen laws, nobody likes you asimov 2011-11-30 19:23:37 -05:00
Tastyfish
b344e2a442 Merge remote-tracking branch 'upstream/master' 2011-11-30 18:35:58 -05:00
Tastyfish
26e1bfdaf1 Added vending charges, removed clown/mime from main joblist, sec belts fixed 2011-11-30 18:34:43 -05:00
petethegoat@gmail.com
85cb13fe95 Reverted the janitor closet to the old trashbag. (It does work, I fixed it up in r2557.) 
A bunch of fixes for various stuff that's been broken about the bag of holding. It should work as intended, now.
Made wet floor signs fit in boxes.
Cleaned up the janitor's closet a bit.
Optimised the vault wiring a bit.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2580 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-30 15:02:01 +00:00
CompactNinja
13ab6b5e56 Crew manifest on join screen. 
Signed-off-by: CompactNinja <kulzernite@hotmail.com>
 2011-11-30 14:48:14 +10:30
headswe
098ec4138d Merge pull request #44 from Tastyfish/master 
Added multiple character slots! ie #31
 2011-11-29 16:45:06 -08:00
Tastyfish
1f9774b827 Merge remote-tracking branch 'upstream/master' 2011-11-29 19:33:29 -05:00
Tastyfish
719002dbee Added multiple character slots! 2011-11-29 19:32:07 -05:00
ryantennessee@yahoo.com
b3bf2edb80 Derped the file names. fixing. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2576 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-29 21:18:54 +00:00
ryantennessee@yahoo.com
a728ae8863 Changed medborgs to hold 1 pill each of dexalin, anti-toxin, kelotane, and bicaradine. Added bicardine pill to chemistry tools. Added borg recharging station to medical, security, and janitor closet. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2575 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-29 21:14:37 +00:00
Head
e1df14b5c1 Forgot to call makejson() 2011-11-29 18:15:49 +01:00
Head
43d71282e0 Added back json support / restart notice 
should fix unnecessary restart after gamemode change before round start
 2011-11-29 15:45:01 +01:00
CompactNinja
6df7528b16 Bunch o hair stuffs. 
Signed-off-by: CompactNinja <kulzernite@hotmail.com>
 2011-11-29 14:03:52 +10:30
petethegoat@gmail.com
9569430cc6 Moving recycling from WorkInProgress to modules, as it isn't wip. 
Also, I could -never- find it in there.

(Please note that due to what seems to be an issue with Tortoise SVN, I have to do this in two commits.)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2570 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-28 20:07:44 +00:00
petethegoat@gmail.com
1cd49a6f13 Replacing monkie with monkey... 
Replaced 11 strings in 8 files

Shout at me if this breaks anything.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2569 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-28 19:39:22 +00:00
petethegoat@gmail.com
986858f761 Fix for Ripley tele-drilling people that had run away. 
Fix for mediborgs inserting their beaker into the chem dispenser. (this broke everything)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2568 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-28 19:34:08 +00:00
vageyenaman@gmail.com
25f8e20822 New adminshit. A verb that lets admins force players to have completely random identities when they join/latejoin. Only works before rounds. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2564 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-27 21:51:39 +00:00
petethegoat@gmail.com
edf76efd86 Fixed issue 205. 
Cyborgs can now just walk into recharging stations.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2560 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-26 18:16:10 +00:00
tronaldnwn@hotmail.com
9038cfdda7 Food: 
Cream pies splat when thrown.
Chaos donuts more chaotic (reduced amount of reagents need to make)
Mystery stew more mysterious (Changed recipe)
Wish Soup some times grants your hungry belly's prayers (new icon).
Meat pie recipes condensed.
Grilled cheese sandwiches
Some reagent amounts may have changed as a result of me seeing them not match the amount of reagent put into making them.
Terribad food descriptions added or modified.


Autolathe has light bulbs, APC parts, and wires in the creation list!

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2558 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-26 16:09:34 +00:00
petethegoat@gmail.com
2190408f0f Massively improved trashbags. PICK UP EVERYTHING! Fixed issue 209. 
Slightly improved mops, and got rid of the "X attacks the blood with the mop!" message.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2557 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-26 15:58:50 +00:00
rockdtben
1de1be054d Implemented more getters/setters for damage system. 2 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2556 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-26 13:33:18 +00:00
Baystation12
74cc33fc02 Merge pull request #24 from CIB/master 
SMES' units have a lot more initial charge now, making life a bit easier for engineers
 2011-11-25 23:34:30 -08:00
vageyenaman@gmail.com
d0d3f3bbfd Hopefully fixes mutagen turning cyborgs into humans. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2554 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-25 22:18:09 +00:00
cib
b00b9674b8 SMES units have a higher initial and maximum charge now. 2011-11-24 23:24:38 -08:00
ryantennessee@yahoo.com
3107d45434 Fixed a derp where I left off a 30 unit option on glass beakers. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2552 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-24 03:02:25 +00:00