cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-22 16:12:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,509 Commits 2 Branches 1 Tag
948d43afecadc272b215ec2e8c46f30a901b5c18
Commit Graph

1626 Commits

Author SHA1 Message Date
Mark9013100
91f191e800 Edits/Changes, 1/3/2016 2016-01-03 20:21:34 -05:00
Yoshax
e2388e06d9 Updates terminology 2015-12-31 01:00:05 +00:00
Yoshax
9da04751ef Removes actually seen mentions of the word retard 2015-12-30 19:52:57 +00:00
Zuhayr
f93ea6a78f Tweaks to previous commits. 
More tweaks to IPC fixes.
Merge resolution/compile fixes.

Further work on properly integrating, updating and fixing prosthetic options.

Repathed internal organs to organ/internal.

More work on full synthetics, changelings, overheating.

Working on getting organs to qdel properly and spawn properly when robotized.

Finalized some overheating values, added remaining prosthetic icons.

Finalizing the testing version of the full prosthetic bodies branch.

Added suit cyclers to the autolathe and map.

Fixing runtime errors.

Fixing errors.

Changelog.

Replacing limb and organ strings with constants.

Prevented brainless species from becoming full cyborgs.

Fixed issues with brain/MMIs renaming themselves inappropriately.

Various fixes and oversights.
 2015-12-24 21:13:40 +10:30
Zuhayr
d71573e749 Further work on properly integrating, updating and fixing prosthetic options. 
WIP
Allowed heads/bodies to be prosthetic. Removed IPC. Refactored some flags.
 2015-12-24 21:10:33 +10:30
Mark9013100
cbbafa5170 Adds the black scrub cap 2015-12-21 12:25:43 -05:00
Zuhayr
6faeea5462 Fixes for the asteroid turf post-changes. 2015-12-21 04:59:32 +10:30
PsiOmegaDelta
5d3d0c5dc3 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/material/kitchen.dm
 2015-12-20 11:22:08 +01:00
Loganbacca
07e81c059c Fixed bullets traveling diagonally through windows 
- Fixes #11465
 2015-12-18 20:12:46 +13:00
Zuhayr
8ebb7c5b5f Rewriting the mining turfs to reduce worldstart lag. 2015-12-16 16:16:41 +10:30
woodratt
e24745b002 -1.3.3.- 
- Strategical headsets added to the merc outpost.
- Cargo Bowman headset sprites added. Added to cargo lockers.
- Cargo Technicians lockers have a 25% chance of spawning dufflebags
- ERT bowman headsets added to ERT area.
- Doors added to ERT area.
 2015-12-13 23:40:07 -08:00
Neerti
2aaa4e9a5e Merge pull request #525 from Zuhayr/qol 
Porting various QOL from Bay.
 2015-12-13 21:25:43 -05:00
Neerti
dc0711a438 Merge pull request #553 from Woodratt/1.3.1_Holiday_Special 
1.3.1 Christmas and tweaks.
 2015-12-13 16:43:39 -05:00
PsiOmegaDelta
a2d2a092c5 All the macros. 2015-12-13 15:19:14 +01:00
Dibasic
1e06889ef1 Fixes window 'bang' typo 
Fixes the typo when harm-intent clicking a window with your bare hand:

<You bang against the window!

to:

You bang against the window!
 2015-12-13 15:06:14 +01:00
Dibasic
c024a20893 Fixes window 'bang' typo 
Fixes the typo when harm-intent clicking a window with your bare hand:

<You bang against the window!

to:

You bang against the window!
 2015-12-13 03:18:43 -06:00
woodratt
13adf4f235 1.3.1 Christmas and tweaks. 
- Intercoms added to the chapel, recreation area, pool.
- Maint door added to the starboard maint.
- Removed the second sleeper from the merc shuttle.
- Replaced the central tree at central with a Christmas tree.
- Added a small Christmas tree, Christmas lights, Tiny Christmas tree, and holiday wreaths to map. (Sprites from Aurora)
- Christmas decorations added everywhere.
- Garden statue tucked into maint, replaced with a big Christmas tree.
- Drink Machine added to security
- Fixed the pathing on therapy dolls.
- Removed farwa plushie from psych office, replaced with blue therapy doll.
 2015-12-12 21:14:23 -08:00
Mark9013100
09b9be4b72 Adds a detective belt and other edits for security 2015-12-11 22:43:13 -05:00
Datraen
ef0337fccf Refactors Telecrystals into individual pools, adds a new command to allow for admins to modify telecrystal levels. 2015-12-11 21:14:11 -05:00
Zuhayr
793bc18efd Mops can now be wet in buckets or sinks. 2015-12-11 15:54:56 +10:30
Neerti
f28a0405a8 Merge pull request #513 from Hubblenaut/tape 
New Police Tape Icons and Placing Algorithms
 2015-12-10 19:51:09 -05:00
Hubblenaut
d4766aa09a Atmos personal locker spawn with atmos tape roll 
Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
 2015-12-10 19:27:04 +01:00
Zuhayr
565e39a28f Porting forensics from Aurora. 2015-12-10 19:16:28 +10:30
PsiOmegaDelta
6a22086c17 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/verbs/suicide.dm
	code/modules/nano/modules/crew_monitor.dm
 2015-12-06 11:34:36 +01:00
GinjaNinja32
85373f7c16 fixes #199 2015-12-05 06:03:43 +00:00
Mark9013100
6e0b906e23 Adds Security/Medical cargopacks. 2015-12-03 20:22:12 -05:00
SinTwo
700ee6177b Clothes Addition, Captain alt title, custom loadout tweakes. 2015-12-03 18:25:45 -05:00
Atlantis
89f5c9f405 Fixes #11540 2015-12-02 11:27:28 +01:00
Zuhayr
4d2db18c70 Added a click delay to interactions with the fire axe cabinet. 2015-12-02 20:38:28 +10:30
PsiOmegaDelta
11e47bc8c2 Fixes being unable to emag secure closets. 
And ensures that this costs an emag charge.
Also corrects emag_act calls. Partial port of https://github.com/PolarisSS13/Polaris/pull/377.
 2015-12-02 08:30:47 +01:00
Jon
8986c49b82 Fixes emagging for secure closets. 2015-12-01 23:53:50 +00:00
Mark9013100
880ba681e6 Combination of my previous PRs, mostly fixes 2015-11-29 11:13:17 -05:00
PsiOmegaDelta
26f167453c Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-11-22 11:40:44 +01:00
Bjorn Neergaard
ef1f91e334 Fix Laptop Vendors and Personal Lockers not accepting ID Containers 
Fixes #11092
 2015-11-22 00:27:03 -06:00
Neerti
4f77afece1 Revert 58ef59734f 2015-11-08 10:09:14 -05:00
Neerti
45f15930a0 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge 
Conflicts:
	.travis.yml
	code/_helpers/lists.dm
	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
	code/global.dm
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	code/modules/reagents/dispenser/dispenser2.dm
	polaris.dme
 2015-11-06 17:41:18 -05:00
Chinsky
ba3c1f03d7 Merge pull request #11195 from Hubblenaut/dev 
CtrlClick deflates inflatables
 2015-11-02 00:11:14 +03:00
Chinsky
1417f4f40b Merge pull request #11344 from Hubblenaut/tape 
Tape - Sprites and Algorithm Changes
 2015-11-02 00:10:03 +03:00
Chinsky
4ae1a45017 Merge pull request #11389 from PsiOmegaDelta/152710-MagicCrescentWindows 
Crescent windows are now near indestructible.
 2015-11-02 00:08:52 +03:00
PsiOmegaDelta
a9f7b3a325 Merge pull request #11247 from Hubblenaut/laundry 
Adds laundry basket
 2015-10-31 11:16:14 +01:00
PsiOmegaDelta
7c7ed0f3fc Crescent windows are now indestructible. 2015-10-28 09:25:12 +01:00
Mark9013100
9b9bcff9de Brings back the Ausop helmets added in one of my earlier PRs. 
Brings back the telescopic shield sprite for the back.
And, as an act of ultimate buuuullshit, a corporate detective uniform, with a detective wardrobe(neither of them are mapped in right now).
 2015-10-26 21:02:16 -04:00
Hubblenaut
ef591fa2b3 Atmos personal locker spawn with atmos tape roll 2015-10-22 14:31:07 +02:00
mwerezak
07881e7495 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into attack-cleanup2 
Conflicts:
	code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm
 2015-10-15 07:08:16 -04:00
Mark9013100
a2c8e3ee10 Minor edits to the sec lockers 
Conflicts:
	maps/colony-1.dmm
 2015-10-11 00:45:22 -04:00
Mark9013100
1273a51f83 Merges f-card box and evidence bag box 
Conflicts:
	code/game/objects/items/weapons/storage/boxes.dm
 2015-10-11 00:41:46 -04:00
Datraen
d0bd6b8857 [BUG FIX] Wardrobe 
Socks are now able to be changed from the wardrobe
 2015-10-11 00:40:54 -04:00
SinTwo
4129b95f4e TG_PORT_fix 2 
Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
	code/modules/clothing/suits/miscellaneous.dm
 2015-10-11 00:36:50 -04:00
SinTwo
a2b24d64b7 TG_Port_2 
Conflicts:
	code/game/objects/items/weapons/storage/backpack.dm
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
	code/game/objects/structures/crates_lockers/closets/wardrobe.dm
	code/modules/client/preferences_gear.dm
	code/modules/clothing/under/accessories/accessory.dm
 2015-10-11 00:36:13 -04:00
Mark9013100
2d709e7862 Flares now spawn in sec lockers 2015-10-11 00:28:47 -04:00