cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-26 10:03:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,881 Commits 2 Branches 1 Tag
1c67be2707f357e168a665e8101f92d355a8889a
Commit Graph

799 Commits

Author SHA1 Message Date
SkyMarshal
1c67be2707 Several fixes/additions. Will list in pull request. 2011-12-18 20:56:39 -07:00
Albert Iordache
bca2746d7c Fixed a spelling mistake. 2011-12-18 13:05:18 +02:00
Albert Iordache
f4a24a9804 Merge pull request #118 from SkyMarshal/master 
Removed a lot of goonish flavor text, resprited emag and centcom id.
 2011-12-18 03:03:04 -08:00
SkyMarshal
fda118e9ac Reworked emag again, new centcom id sprite, removed derpy flavor text. 2011-12-18 03:20:54 -07:00
Albert Iordache
1816be90a0 Merge pull request #117 from SkyMarshal/master 
Again, check description.
 2011-12-18 00:28:53 -08:00
SkyMarshal
3d51c2487b Fixed a bunch of descriptions. 2011-12-18 01:06:05 -07:00
SkyMarshal
fc3914364f Finished pepperspray, added mace item, improved security console, and a few other things. Will know when I see the diffs. 2011-12-18 00:23:02 -07:00
Tastyfish
75ddaeb9f9 Merge remote-tracking branch 'upstream/master' 2011-12-17 21:52:05 -05:00
Tastyfish
a741413992 carve books, remove immovable rod/gr3y t1de 2011-12-17 20:46:42 -05:00
SkyMarshal
159ce32cc7 Improved pepper spray, added a safety catch to pepper spray and space cleaner, added a wire to reset the module of a borg. 2011-12-15 23:58:17 -07:00
Miniature
8889972b07 Dogs don't wear clothes. 2011-12-13 13:18:46 +10:30
CIB
985112f052 Merge pull request #92 from Abi79/master 
Slurring from Alcohol, btw. Aryn wrote the slur proc
 2011-12-10 12:54:45 -08:00
Albert Iordache
e72ae5e8f6 Added a new slurring variable, and set it up in the right places 2011-12-10 14:25:49 +02:00
Tastyfish
61ae382c16 added categories to QM stuff so it isn't a giant several-page list 2011-12-10 01:25:27 -05:00
Albert Iordache
3efa552eda Merge branch 'master' of https://github.com/Miniature/Baystation12 into Miniature-master 
Conflicts:
	code/modules/mob/living/carbon/alien/humanoid/life.dm
	code/modules/mob/living/carbon/alien/larva/life.dm
 2011-12-09 14:56:32 +02:00
cib
5b349cc549 Revert "Moved the singularity and particle accelerator a bit out of the station. Added some stuff to engineering and generally organized it a bit." 
This reverts commit a6e7d09620.
 2011-12-08 20:47:37 -08:00
cib
4b7c6c5183 Merge branch 'master' of github.com:Baystation12/Baystation12 2011-12-08 18:44:43 -08:00
Tastyfish
14f0a4d0b9 UnRevert "the closet tg merge broke my charge crates" 
This reverts commit 2694238e88.
 2011-12-06 21:04:41 -05:00
Tastyfish
ecb6f2b2d6 Revert "the closet tg merge broke my charge crates" 
This reverts commit 2694238e88.
 2011-12-06 21:00:08 -05:00
Tastyfish
ac627aa521 Merge branch 'master' of github.com:Tastyfish/Baystation12 2011-12-06 20:36:20 -05:00
Tastyfish
2694238e88 the closet tg merge broke my charge crates 2011-12-06 20:35:07 -05:00
Miniature
af301633f6 Merge branch 'master' of git://github.com/Abi79/tgstation13-git 
Conflicts:
	baystation12.dme
	code/defines/obj/vending.dm
	code/game/machinery/vending.dm
	html/changelog.html
	maps/tgstation.2.0.8.dmm
 2011-12-07 07:53:20 +10:30
cib
a6e7d09620 Moved the singularity and particle accelerator a bit out of the station. Added some stuff to engineering and generally organized it a bit. 2011-12-06 05:24:43 -08:00
uporotiy
4764cdc990 Aliens: 
Reworked the code to use a new "plasma" var instead of toxloss for their powers.
Facehuggers are now active for 30 to 60 instead of 3 to 5 seconds.
Aliens can see whether facehuggers are active without needing to examine them.
Changelings:
Ranged sting is now 2 squares-ranged instead of 3 squares.
Space:
Reverted the randomly accessible z-levels back to how they were (derelict and ai sat).

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2627 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-06 08:30:03 +00:00
headswe
ec2456a1f0 Merge pull request #60 from Tastyfish/master 
borgs go beep and janitor borgs can OCD, charge ordering bug fix, flavor text
 2011-12-04 15:31:07 -08:00
uhangi@gmail.com
44c0cfc46d -Adding pepper spray for security officers. 
-Fixed a storage bug for chemsprayers and space cleaner

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2618 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-04 22:42:18 +00:00
Tastyfish
c208332942 added Anchorshag's examination flavor text thingy 2011-12-04 15:26:46 -05:00
Miniature
5543fe749f Animals as captains? Human supremacy! 2011-12-05 01:34:36 +10:30
baloh.matevz@gmail.com
9c872b28e1 Reinforced metal renamed to steel, since that what it now is. 
Steel floor tile renamed to metal floor tile to avoid confusion before it even happens
Grass plants in hydro will now actually make grass floor tiles instead of really awkward patches
You can no longer make steel via autolathe, you can however make metal, and inserting r-metal will still give you metal for use in the lathe
Added 10 sheets of steel to EVA and 10 units of steel to engineering


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2604 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-04 03:55:58 +00:00
LastBattaWolf@hotmail.com
855b087f38 (Committed for PolymorphBlue) Traitors in the prison cell on the escape shuttle now fail their objective. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2599 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-04 02:37:19 +00:00
uhangi@gmail.com
1136054925 Fucked up, NOW space is depowered. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2598 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-04 01:27:44 +00:00
uhangi@gmail.com
ab779def53 Depowered space 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2597 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-04 00:11:40 +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
5d4b707553 Fixed all known problems with vending machines. 
Fixed a minor visual bug with emagged lockers.
Minor botany rebalance by Numbers.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2595 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-03 15:36:17 +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
ryantennessee@yahoo.com
186fbad7fd Fixed spelling error in /obj/item/stack/tile/steel singular name. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2592 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-02 18:37:53 +00:00
n3ophyt3
67e43e4baf New toy, as coded by Threadstrong. 
A delightful fake sunflower, that also doubles as a squirtgun. Refillable via watertanks.

Currently adminspawn only because I am too lazy to make it spawn anywhere right now.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2589 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-02 01:51:40 +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
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
kortgstation@gmail.com
763c0ecf71 Can now make light tubes/bulbs in the autolathe 
Old trashbag was buggy as fuck and useless. Didn't touch it's code, but replaced it's spawn in the janitors locker with a 20 slot, tiny item only storage object (new trashbag)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2577 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-30 05:35:40 +00:00
Tastyfish
e58dd6030f Auto-flush disposals, auto-hush vendending machines 2011-11-29 02:42:08 -05:00
Tastyfish
e89488975f we work for NanoTrasen! Also, we don't have enough people for your fancy 
15-person minimums
 2011-11-29 00:19:37 -05: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
9aecc4286b Implemented more getters/setters for damage system. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2555 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-26 12:58:15 +00:00