cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-18 06:01:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,749 Commits 5 Branches 1 Tag
c47794b54b10bc9d4ba4acaecea2bca6bd24c9c2
Commit Graph

26773 Commits

Author SHA1 Message Date
Atermonera
c47794b54b Christmas Crackers work on borgs 2017-12-10 23:03:17 -08:00
Belsima
dd991a1475 Replaces cola machine sprite. (#4387) 
* Replaces cola machine sprite.

* fix
 2017-12-09 16:44:33 -06:00
Mewchild
e97b301838 Take two. New drinks (#4259) 
* Adds new drinks

Adds many new drinks. Adds bitters, a staple for mixing.

* Fixes errors.

Also shut up travis :c

* Fixes Bitters/Buracao conflict

Makes it so that bitters require water and more enzyme, to avoid a
conflict with Blue Curacao

* Bitters use mint instead of orange

A more elegant solution to my last

* Removes duplicate

Rotgut was defined twice.

* Another duplicate

Mojito got defined twice.

* Adds Cold Front

Cold Front - 1 Iced Coffee, 1 Whiskey, 1 Mint. Lowers body temperature
by a severe amount. (Functionally the opposite of antifreeze)

* Fixes spacing issues

Changes Four Space to Tab indent

* Requested changes

Makes new milkshakes children of milkshake
Lowers Named Bullet slime jelly to 0.25u, down from 2u
Fixes a mismatch in amounts on the mint julep

* Fixed undefined drinks

Defines Mint Julep and Love potion
 2017-12-09 16:25:06 -06:00
Neerti
791754b2de Merge pull request #4382 from Anewbe/parachute 
Adds parachutes
 2017-12-08 20:17:51 -05:00
Belsima
8d3ceab287 grammar never ends (#4421) 
* Update Sleeper.dm

* Update robot_fabricator.dm

* Update requests_console.dm

* Update vr_console.dm

* Update teleporter.dm

* Update records_scanner.dm

* Update mercrenegade.dm

* Update clown_items.dm

* Update firstaid.dm

* Update teleporter.dm

* capitalization fixes

* Update clown_items.dm
 2017-12-08 15:30:34 -06:00
Mechoid
1175713235 Merge pull request #4408 from Anewbe/adv_kit_tweaks 
Reduces adv medical item healing from 5 to 3
 2017-12-07 16:22:13 -08:00
Mechoid
08ad1c8e64 Merge pull request #4415 from Anewbe/carbine 
Changes the Laser Carbine/Rifle
 2017-12-07 16:21:22 -08:00
Belsima
ad0ad62cde The game actually clicks when it claims to. (#4403) 
* Update paiwire.dm

* Update life.dm

* Update traps.dm

* Update safe.dm

* Update alarm.dm

* Update safe.dm

* Update implant.dm

* Update life.dm

* Update traps.dm

* Update life.dm

* Update safe.dm

* Audible message test
 2017-12-07 18:18:01 -06:00
Anewbe
573d3a1bbd Merge branch 'master' of https://github.com/PolarisSS13/Polaris into parachute 
# Conflicts:
#	icons/obj/storage.dmi
 2017-12-07 17:59:13 -06:00
Layne
4d842c6590 Adds snowballs. (#4414) 2017-12-07 17:51:36 -06:00
Belsima
b819963102 Flashes now click when they say they click. (#4393) 
* Flashes now click when they say they click.

* Better sound effect.
 2017-12-07 17:50:12 -06:00
mistyLuminescence
4b102b7870 Adds food bags! (#4389) 2017-12-07 17:49:59 -06:00
Mechoid
820b41575d Adds Mining Drones and a fabricator for them. Hooray amending commits, also. (#4413) 2017-12-07 17:32:26 -06:00
Anewbe
1499a48238 Merge pull request #4410 from Belsima/fuckssake 
can you seriously not spell sticky
 2017-12-07 17:31:29 -06:00
Anewbe
395e7693b4 Merge pull request #4416 from Verkister/patch-1 
Makes player simplemobs able to finish off snacks.
 2017-12-07 17:29:30 -06:00
MisterLayne
05954a278a K. 2017-12-06 16:14:55 -05:00
Verkister
cce138b094 Makes player simplemobs able to finish off snacks. 
No more endless futile nibbling. Tested working fine.
 2017-12-06 20:57:54 +02:00
Belsima
bb6d52d13d Adds blennophobia. (#4397) 
* Adds blennophobia.

* Adds blennophobia to character setup.

* fear updates
 2017-12-05 23:51:36 -06:00
Belsima
c9d53f5aa4 Maint drones may now ventcrawl. (#4394) 
* Maint drones may now ventcrawl.

* Drones can now have any items they want in vents. No stowing needed.
 2017-12-05 23:49:10 -06:00
Mechoid
931056877f Merge pull request #4391 from Anewbe/ghosts 
Ghosts no longer show up over living mobs
 2017-12-05 21:44:23 -08:00
Neerti
fab9a877cc Merge pull request #4390 from Anewbe/species_blood_tweaks 
Makes species bleed out faster or slower
 2017-12-06 00:43:59 -05:00
Anewbe
a841d57239 Changes the Laser Carbine/Rifle 2017-12-05 23:36:05 -06:00
Belsima
3bf74de3b1 Grammar time, again. (#4402) 
* Shriek grammar.

* Updates jumpsuit grammar.

* Update civilian.dm

* Update NewBan.dm

* Update gravitygenerator.dm

* Update Dreaming.dm

* Update shriek.dm

* Update NewBan.dm
 2017-12-05 14:34:45 -06:00
Anewbe
690c041aa4 Merge pull request #4396 from PrismaticGynoid/ghostlocker 
Ports ghosts examining locker contents
 2017-12-05 14:34:18 -06:00
Anewbe
73991e697e Merge pull request #4395 from PrismaticGynoid/geigerghost 
Ports check_radiation verb for ghosts
 2017-12-05 14:34:05 -06:00
Mechoid
c72e7310e3 Merge pull request #4398 from mistyLuminescence/laythebikeshedtorest 
PsychHUD!
 2017-12-05 10:11:55 -08:00
Belsima
d266b67eba can you seriously not spell sticky 2017-12-05 12:50:04 -05:00
Anewbe
d0c580e0cb Reduces adv medical item healing from 5 to 3 2017-12-04 18:35:01 -06:00
Anewbe
d2a90fcec4 Fixes High Cap water tanks, lets drones move tanks again. 2017-12-04 17:43:57 -06:00
mistyLuminescence
532cc711fa PsychHUD! 2017-12-04 00:05:10 +00:00
PrismaticGynoid
ba271e168b Ports check_radiation verb for ghosts 
From https://github.com/Baystation12/Baystation12/pull/19390 . Ghosts now have a check radiation verb they can use to see the radiation level of where they're standing, similar to geiger counters. Tested in every scenario involving radiation I could think of, and it works just fine.
 2017-12-03 15:43:01 -08:00
mistyLuminescence
0d458b204e Adds the advanced health analyzer (#4326) 
* WIP - advanced health analyzer

* Adds the advanced health analyzer.

* Updates radiation levels

* Fixes travis and removes snark

* Fixes a bug that wasn't my fault (for real)

* Adds tiers.

* Phasic sounds cooler

* Fixes sprites
 2017-12-03 17:36:51 -06:00
mistyLuminescence
c2c8d52a12 RUST updates (#4325) 
* RUST updates

* Makes RUST work, this time with fusion reagents too
 2017-12-03 17:35:41 -06:00
PrismaticGynoid
fe9d6864c0 Ports ghosts examining locker contents 
A port of https://github.com/Baystation12/Baystation12/pull/19436 . Ghosts clicking on a locker or crate to examine it can now see a list of its contents.
 2017-12-03 15:25:04 -08:00
Anewbe
4d938d58bb Ghosts no longer show up over living mobs 2017-12-02 19:43:44 -06:00
Anewbe
c95206c9f3 Makes species bleed out faster or slower 2017-12-02 18:14:35 -06:00
Mechoid
5931a8cf34 Merge pull request #4377 from Anewbe/roller_chairs 
Can no longer run around while in a roller chair
 2017-12-02 16:11:20 -08:00
Anewbe
e51f3aad61 Fixes sprites, moves planetary explosion to fall_impact 2017-12-02 16:36:50 -06:00
Anewbe
c9de815e27 Merge pull request #4385 from Belsima/tinycirc 
Fixes circuit icon states.
 2017-12-02 12:50:45 -06:00
Anewbe
5fffb9d51f Merge pull request #4378 from Neerti/12/1/2017_reaching_weapons 
Adds Reach Variable to Weapons
 2017-12-02 12:00:26 -06:00
Belsima
74aeaaa7ea Fixes circuit icon states. 2017-12-02 09:09:19 -05:00
Anewbe
132168bc81 Further parachute functionality 2017-12-01 22:11:38 -06:00
Anewbe
b4dfdb8aec Merge branch 'master' of https://github.com/PolarisSS13/Polaris into parachute 2017-12-01 19:19:48 -06:00
Anewbe
c2a8afb7c0 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into parachute 
# Conflicts:
#	icons/mob/back.dmi
#	icons/obj/storage.dmi
 2017-12-01 18:47:06 -06:00
Anewbe
085c33e39a Adds parachutes 2017-12-01 18:37:30 -06:00
Anewbe
8bd4ae31ba Revert "Revert "Revert "Revert "Revert "Switches us to the Southern Cross for testing""""" 2017-12-01 18:21:46 -06:00
Layne
3f21df1ae2 Fixy fixy. (#4314) 2017-12-01 16:18:20 -06:00
Neerti
7b36067acd Merge pull request #4379 from PolarisSS13/revert-4359-revert-4345-revert-4301-revert-4292-NOV17MAP_TEST 
Revert "Revert "Revert "Revert "Switches us to the Southern Cross for testing""""
 2017-12-01 17:16:58 -05:00
Anewbe
5bf6d4f9c0 Merge pull request #4380 from Woodratt/12012017_SC_Calambugfixes 
Further SC bug fixes
 2017-12-01 16:15:57 -06:00
Woodratt
9f71125f13 Further SC bug fixes 
- Bug fixes and additions
- Finishes out floor decal work
- Adds tiny Christmas stuff
 2017-12-01 14:01:31 -08:00