cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-30 20:13:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,122 Commits 2 Branches 1 Tag
8fc4e4e7db36884d288bd09007672925c465b2ea
Commit Graph

341 Commits

Author SHA1 Message Date
Loganbacca
4b1bb13ace Crate and closet updates 
- Added atmos themed sprite for atmospheric technician secure closets
- Added a second radiation suit to radiation suit closets
- Added a solar pack crate (because adding crates to the map with this many objects manually is silly)
 2014-02-08 18:35:13 +13:00
RavingManiac
30915b5ba4 Escape shuttle modified after feedback. 
Wall emergency lockers now contain two breath masks and two emergency oxygen tanks.

Emergency ration crates contain two boxes of donk-pockets. The escape shuttle has two crates at the back.
 2014-02-02 16:04:11 +08:00
RKF45
8fbcda2a0b Reintroducing the dough-based cooking system. 2014-02-01 02:17:38 +01:00
suethecake
6f69e7f821 Stuff. 2014-01-29 18:15:35 -06:00
Ccomp5950
283df26fa7 Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev 2014-01-23 00:19:01 -06:00
Ccomp5950
c028db481e Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/monkey/diona.dm
	code/modules/reagents/Chemistry-Machinery.dm
 2014-01-23 00:05:53 -06:00
LBraindead
9d618b2a11 Update lattice.dm 
allow lattices to exist on open space
 2014-01-18 00:16:14 +01:00
Loganbacca
682dfd5670 More typo fixes 
Missed these in the last commit.
 2014-01-15 20:03:12 +13:00
Loganbacca
c83537a6a9 Sink filling typo 
No more filling the the bucket using the sink.
 2014-01-15 19:13:06 +13:00
Chinsky
76dc0c4c49 Merge pull request #4234 from Mloc/bs12-quicklist 
[TG] Optimized and refactored list2text, text2list, and replacetext.
 2014-01-10 11:55:33 -08:00
Kyrah Abattoir
98f02be5a6 code/game/object/items/weapons/* lowercase pass 
code/game/object/structure/* lowercase pass (start)

Conflicts:
	code/game/objects/items/weapons/AI_modules.dm
	code/game/objects/items/weapons/paint.dm
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/objects/items/weapons/storage/uplink_kits.dm
	code/game/objects/items/weapons/vending_items.dm
	code/game/objects/items/weapons/weaponry.dm
	code/game/objects/structures/bedsheet_bin.dm
	code/game/objects/structures/door_assembly.dm
 2014-01-08 19:56:00 +00:00
Razharas
3b66f33d14 Fixes morgue trays used by ghosts and what not 2014-01-08 19:39:20 +00:00
Cluwnes Honk
2069a9e83c Personnelly, I feel this pull request was successfull. 
Spelling fixes.

Conflicts:
	code/game/machinery/newscaster.dm
 2014-01-08 19:26:10 +00:00
YotaXP
68ae21fac3 Optimized and refactored list2text, text2list, and replacetext. 
Also fixed some grammar in the station blueprint code.

Conflicts:
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/uplinks.dm
	code/modules/admin/verbs/debug.dm
	code/modules/clothing/masks/gasmask.dm
	code/modules/detectivework/scanner.dm
	code/modules/flufftext/TextFilters.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/silicon/ai/say.dm
 2014-01-08 11:41:51 +00:00
Zuhayr
62893f80b6 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-01-04 11:35:07 +10:30
Ccomp5950
f0563911cb Fingerprints on showers and crayon graffiti. 
fixes #4076
as well as admin request on crayons.
 2014-01-02 20:26:14 -06:00
DJSnapshot
b294174acb Openable soda cans and beer bottles! 2013-12-31 17:52:12 -08:00
Zuhayr
53c94f76bd Merge pull request #4134 from comma/gunlocker 
Adds gun cabinets - special snowflake secure closets.
 2013-12-29 06:25:12 -08:00
Chinsky
e63d5c14a5 BYOND cannot into chain assignment 2013-12-29 17:52:56 +04:00
Chinsky
bca1aa5bd4 Merge pull request #4096 from fauxki/dev 
RD Closet Changes
 2013-12-23 04:39:46 -08:00
Chinsky
94e94dfa5d Adds gun cabinets - special snowflake secure closets. 
Specialness is that icon of closed cabinet depends on if there are guns in it, and their type.
 2013-12-22 23:10:22 +04:00
Mloc
cd9c933111 Merge pull request #4088 from comma/signs 
Adds signs pointing where department is.
 2013-12-22 05:32:07 -08:00
Zuhayr
b9fcd34df3 Merged config and changelog. 2013-12-22 23:11:29 +10:30
fauxki
a6aa087e00 Places RD Alt uniform, RD dress, and leather shoes in RD closet. 2013-12-22 04:17:46 -08:00
Zuhayr
bb602139b0 Merge pull request #4074 from fauxki/dev 
Centcom Update + Minor Updates
 2013-12-20 10:35:57 -08:00
fauxki
247cae41a1 Adds in the red shoes I forgot to put into the closet that has all the colored shoes in it. 2013-12-20 01:29:13 -08:00
Zuhayr
11f8a5835f Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-12-19 00:01:12 +10:30
Chinsky
582bebc0d1 Adds signs pointing where department is. 
Change dir var to change direction of arrow.
 2013-12-18 12:34:53 +04:00
Zuhayr
924a7af50a Fixes #4034 2013-12-18 11:17:17 +10:30
Zuhayr
6984ba3fec Fixes #4040 2013-12-18 11:10:00 +10:30
Zuhayr
0695774d24 Fixes #4050 2013-12-18 01:04:52 +10:30
Mloc-Argent
b175c6906b Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev 
Conflicts:
	html/changelog.html
 2013-12-13 19:13:43 +00:00
Zuhayr
b3c0079e18 Merge pull request #4004 from volas/master 
Minor fixes
 2013-12-05 02:56:06 -08:00
volas
e33490d80a Fixes: AI won't steal fax, and mice won't flip tables anymore. 2013-11-30 23:54:06 +04:00
Chinsky
5b168c8e4b Merge branch 'dev-freeze' into dev 
Conflicts:
	icons/obj/ammo.dmi
 2013-11-30 05:15:22 +04:00
Chinsky
83d1924b83 Commiting SueTheCake's detective things. 
-New set of clothes spawning in the closet.
-Replacement of revolver by semiauto gun, with update to autolathe recipies.
 2013-11-27 04:10:06 +04:00
Mloc
503302dae5 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/implants/implant.dm
	code/modules/reagents/Chemistry-Machinery.dm
 2013-11-24 23:37:09 +00:00
Nanai
a8f1ee6c91 Girder health/laserkill fix 
Allows girders to be broken by repeated laser shots to stop abuse against laserfire. Also, for actually being able to lase through walls if they're open.

Resolves issue #3796
 2013-11-23 18:50:15 -05:00
Zuhayr
185c83b287 Fixes #3642 2013-11-24 09:22:50 +10:30
DJSnapshot
7665a1a00e Merge pull request #3895 from Baystation12/master 
Merge Dev with Master
 2013-11-07 16:31:43 -08:00
Chinsky
b7edb181ed Where can I get my idiot certificate. 2013-11-05 03:59:39 +04:00
Chinsky
98ba7e4699 Fixes zombie goast tableflips 2013-11-04 22:36:22 +04:00
Mloc-Argent
f1b230edc4 Merge branch 'master' into dev 2013-11-04 10:46:13 +00:00
Iamgoofball
a75492d26b Startoad's plasma windows commit, I'm doing the github stuff for it. 
3677121b51
 2013-11-01 18:53:45 -07:00
Cael Aislinn
a4e5bad409 fixes an overwritten fusion reaction, fixes typo on id computer, makes transit tubes traversible, makes conveyor switches access protected 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2013-10-29 05:10:17 +10:00
Segrain
858df5ca64 Fix for #3804. 2013-10-24 19:16:54 +03:00
Segrain
8bd055357a Same fix again. 2013-10-21 04:48:07 +03:00
Segrain
121b10b16c Conflict fix. 2013-10-21 04:37:28 +03:00
Segrain
ace205b323 Code cleanup. 2013-10-18 08:40:45 +03:00
Chinsky
930a30cfd0 Moved stuff from /structure to /obj/structure because I am tired of accidently going inside of it for unused file and empty file 2013-10-16 12:51:30 +04:00