cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-26 18:13:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,102 Commits 2 Branches 1 Tag
7fc9e1a60b6f823a981c79b23933b05b50f9d8d3
Commit Graph

26259 Commits

Author SHA1 Message Date
Anewbe
7fc9e1a60b Comments out the Tunguska spawn chance, in preparation for the new map 2017-10-13 00:51:16 -05:00
Neerti
e582a52e91 Merge pull request #4047 from Anewbe/cloning_machine_fix 
Should make upgraded cloners spit out clones again
 2017-10-13 01:25:30 -04:00
elgeonmb
251f5a4139 Adds drink fluff; fixes drink descriptions (#4038) 
* It's not all Morpheus this time (#1)

* drink fluff

* changes drink descriptions to suck less

* Update containers.dm

* Update bottle.dm
 2017-10-12 23:01:24 -05:00
Belsima
e97124bb6c Minor grammar fixes + cold protection. (#4044) 
* Removes extra space.

* Grammar fixes + cold protection.
 2017-10-12 22:51:16 -05:00
Anewbe
152cb3910c Merge pull request #4039 from Woodratt/10092017_WRBreaksEverything 
Porting see down through open spaces
 2017-10-12 22:48:19 -05:00
Anewbe
cf6b558be8 Corrects security ids 2017-10-12 17:44:51 -05:00
Anewbe
069adbb538 Ids should have accounts now 2017-10-12 17:01:20 -05:00
Anewbe
332bcbd114 Fixes job access 2017-10-12 15:27:18 -05:00
Belsima
f6a24337fd Examine grammar fixes. (#4051) 
* Update engineering.dm

* Update atmospherics.dm

* Update mobs.dm

* Update structures.dm

* Update weapons.dm
 2017-10-12 11:15:22 -05:00
Belsima
3069df74a4 Spelling + drone (#4050) 2017-10-12 11:14:46 -05:00
Belsima
ad9d876922 they spelled it wrong (#4049) 2017-10-12 11:14:30 -05:00
Anewbe
755ac361bb Should make upgraded cloners spit out clones again 2017-10-11 22:49:23 -05:00
Anewbe
dea7346b94 Fixes the autologging items in antag records 2017-10-11 21:16:18 -05:00
Neerti
7cafd7d239 Merge pull request #4002 from Anewbe/outfits 
Ports Bay's outfit system
 2017-10-11 22:00:45 -04:00
Neerti
d848197534 Merge pull request #4029 from Anewbe/skeletons 
Adds Skeletons for background use
 2017-10-11 14:48:41 -04:00
Anewbe
c343d182ce Merge pull request #4041 from Cyantime/patch-1 
Fixes a typo in alternate job title selection.
 2017-10-10 23:42:41 -05:00
Anewbe
2530fdf2a5 Merge pull request #4040 from Neerti/9/28/2017_web_shuttles 
Adds 'Web Shuttles' for the Southern Cross
 2017-10-10 23:41:47 -05:00
Cyantime
b38819afe2 Fixes a typo in alternate job title selection. 2017-10-10 14:19:21 -04:00
Neerti
2d1e7c3ed2 Tries to please Travis. 2017-10-10 02:16:23 -04:00
Neerti
92b72cfbed Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 9/30/2017_golems_and_animals 2017-10-10 01:21:39 -04:00
Neerti
1f0bb5891c Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 9/28/2017_web_shuttles 
# Conflicts resolved:
#	code/modules/busy_space/organizations.dm
 2017-10-10 01:19:53 -04:00
Woodratt
0f6d0a9e4f Porting see down through open spaces 
Ported 'see-down' open spaces from Vore, who ported it from Eris

Ported talking and visible messages traveling upwards through open spaces

Tested, seems to work? Does not seem to break anything, maybe.

Maybe made a changelog.
 2017-10-09 22:05:20 -07:00
Neerti
7225ea2b66 Read github PR for details. 2017-10-10 00:48:27 -04:00
elgeonmb
4e87fe4161 Veyships2 (#4037) 
* It's not all Morpheus this time (#1)

* ship names
 2017-10-09 23:32:01 -05:00
Neerti
b4a1e16132 Merge pull request #4027 from Anewbe/landmark_fixes 
Landmark fixes
 2017-10-09 03:41:47 -04:00
Neerti
ab77d23810 Merge pull request #4034 from Anewbe/more_holster_things 
Makes a bunch of things fit in holsters
 2017-10-09 03:41:32 -04:00
Anewbe
ff7c4fe45a Makes a bunch of things fit in holsters 2017-10-07 17:24:18 -05:00
Anewbe
6f5837177a It's not all Morpheus this time 2017-10-07 15:57:32 -05:00
Anewbe
1f9a14ffd7 Adds Skeletons for background use 2017-10-06 20:40:12 -05:00
Anewbe
ccd90031fa Merge pull request #4018 from MisterLayne/10/4/2017_DufflebagsSci 
Science Dufflebag
 2017-10-06 10:51:05 -05:00
Anewbe
7e1a5407e1 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into landmark_fixes 2017-10-06 00:18:50 -05:00
Neerti
7266310755 Merge pull request #4025 from Anewbe/prosthetic_organs 
Prosthetic Organs Tweaks
 2017-10-06 01:18:16 -04:00
Neerti
ce1dd6b9fa Merge pull request #4022 from elgeonmb/tracomtweak 
Tracom tweak 2.0
 2017-10-06 01:13:15 -04:00
Neerti
2c4a143128 Merge pull request #4016 from Anewbe/snowshoes 
Adjusts checks for turf-slowed movement
 2017-10-06 01:12:07 -04:00
Anewbe
098bb66e4a Makes landmarks invisible, mobcorpse landmark actually despawns 2017-10-05 21:44:26 -05:00
Anewbe
9d5dd1cc48 Allows use of more internal prosthetic organs 2017-10-05 20:42:03 -05:00
MisterLayne
8aed98be14 Adds science dufflebag 2017-10-05 16:26:56 -04:00
Neerti
4b1eb3a19a Merge pull request #4017 from Anewbe/lawbook 
Adds Neerti's Law Book
 2017-10-05 12:56:23 -04:00
elgeonmb
18e60b0f57 Update organizations.dm 2017-10-05 01:18:46 -07:00
Anewbe
66837464d2 Implanters should have an icon again 2017-10-04 23:07:59 -05:00
Anewbe
152cf3362c Finishing touches on outfit code 2017-10-04 21:55:55 -05:00
Anewbe
82f24079f4 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into outfits 
# Conflicts:
#	code/game/jobs/job/assistant.dm
#	code/game/jobs/job/civilian.dm
#	code/modules/admin/admin_verbs.dm
 2017-10-04 20:08:55 -05:00
Anewbe
10b0264c6a Yet more work on the Outfit System 2017-10-04 20:05:20 -05:00
Neerti
4db89d42f5 Merge pull request #4014 from Anewbe/drone_permits 
Drone permits can now be worn
 2017-10-04 20:59:29 -04:00
elgeonmb
4fe72daba3 curlyboy 2017-10-04 17:31:16 -07:00
elgeonmb
5361299b9f Update organizations.dm 2017-10-04 17:30:13 -07:00
elgeonmb
1cb7f36c6c Adds new organization-specific locations in the tracon module 
and misc tweaks.

1) Adds systems with lore and trade with SCG to the generic destinations list

2)Gives Vey-Med some Skrell-focused destinations

3)Gives Heph some millitary destinations

4)Gives Morpheus trade with Shelf

5)Strips out the "Icarus" generic ship name and the NDV Icarus Nanotrasen destination. Suddenly this word has a lot of history and I somehow don't see NT naming a ship after the political party they're bitterly opposed to
 2017-10-04 17:18:43 -07:00
Anewbe
4459d7087a Revert "Does more prep for the Event Manager role" 2017-10-04 18:33:34 -05:00
Anewbe
cf9245b5fb More work on outfits 2017-10-04 11:49:24 -05:00
Anewbe
094df467a9 Continues work on Outfits 2017-10-04 01:14:09 -05:00