Commit Graph

22674 Commits

Author SHA1 Message Date
Neerti
7df84a3cad Removes stray ..() in communicator.dm 2015-12-15 21:10:22 -05:00
Neerti
52a584563c Merge pull request #589 from Zuhayr/master
Ports aiming rewrite.
2015-12-15 20:57:54 -05:00
Neerti
55b7851edc Merge pull request #590 from Hubblenaut/buckle
No verbose cantouch check when not climbable
2015-12-15 20:55:49 -05:00
Neerti
280844af65 Update cult_structures.dm
Deletes the commented out code.
2015-12-15 20:50:10 -05:00
Neerti
3752d44324 Removes ability to summon Narsie, replaced with a summon Hell rune.
Spooky cult mobs nerfed.
Manifested people no longer count for summoning Hell.
2015-12-15 20:36:02 -05:00
Hubblenaut
e10393324d No verbose cantouch check when not climbable 2015-12-16 02:28:19 +01:00
Zuhayr
8c6750e656 Removed minimum ages. 2015-12-16 11:10:39 +10:30
Zuhayr
b38a42c665 Compile fixes/port fixes. 2015-12-16 10:53:10 +10:30
Zuhayr
6e8368ac4c Rewrote targeting. 2015-12-16 10:26:40 +10:30
Zuhayr
0148e78eda Removed targeting. 2015-12-16 10:25:18 +10:30
Neerti
e73a809ade Uses get_turf(), so that messages can be heard while someone is holding the communicator. 2015-12-15 16:57:58 -05:00
Neerti
24903d073e Merge pull request #585 from Neerti/12/15/2015_git_gud
Changeling nerfs
2015-12-15 16:23:17 -05:00
Neerti
a7529a87d2 Merge pull request #578 from Hubblenaut/atmos
Fixes duplicate gas layers
2015-12-15 16:15:08 -05:00
Neerti
ec14777e29 Merge pull request #579 from Hubblenaut/master
Tweaks Filtering and Toxic Gases
2015-12-15 16:14:53 -05:00
Neerti
c84260a4de Nerfs Changelings in various ways. Spacearmor is weaker. Cryosting is less potent, and there is now a three minute cooldown when using Cryostring or Delayed Toxic Sting 2015-12-15 16:08:53 -05:00
Hubblenaut
bb55eb7368 Fixes vaccum pockets on new floors 2015-12-15 15:48:00 +01:00
Hubblenaut
58cb56492e Tweaks Filtering and Toxic Gases 2015-12-15 13:57:52 +01:00
Hubblenaut
d1f14cd16d Fixes duplicate gas layers 2015-12-15 13:42:31 +01:00
Hubblenaut
b994a07dc2 Fixes duplicate gas layers 2015-12-15 13:32:01 +01:00
Mark9013100
edd53b813c Corrections to custom loadout 2015-12-14 19:18:56 -05:00
Mark9013100
172ef26cc9 Adds festive santa hats! 2015-12-14 18:32:00 -05:00
GinjaNinja32
e068a689e3 tweak power cost 2015-12-14 23:13:17 +00:00
GinjaNinja32
53905d3669 add chemical regeneration to cartridge dispensers, remove energy dispensers 2015-12-14 23:01:45 +00:00
Neerti
e9e163f5ed Merge pull request #569 from Neerti/12/14/2015_communicators_v2
Communicators: Reloaded: Revenge of the NanoUI
2015-12-14 17:32:09 -05:00
SinTwo
52095fb4d5 Merge pull request #568 from EmperorJon/14_Dec._Fix_flavour_text
Fixes flavour text
2015-12-14 17:28:32 -05:00
Neerti
0cb2586ce5 Fixes misplaced processing_objects -= src in observer Destroy() 2015-12-14 17:09:52 -05:00
Neerti
8d3cc68771 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 12/14/2015_communicators_v2 2015-12-14 15:44:38 -05:00
Neerti
3e5436c4b7 Upgrades communicators to NanoUI, adds a new EPv2 fake networking system, adds new semi-telecomms machine, lets communicators call ghosts, call other communicators, and have as many ghosts or communicators linked as the user desires. Adds preference option to remain invisible on communicator device searches. 2015-12-14 15:43:53 -05:00
Jon
14bc2afe43 Removes errant debug line. 2015-12-14 20:22:18 +00:00
Jon
af802266e4 Removes the else to properly for the switch statement, meaning that it no longer wipes your flavour text/thinks you're opening the general slot ever time. 2015-12-14 20:20:35 +00:00
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
sabess
1bf719f20f Fixed brass knuckles; only possible to get them from steel now. 2015-12-14 16:38:05 +11:00
sabess
7ddacea47c Merge branch 'master' of https://github.com/Sabess/Polaris 2015-12-14 15:59:07 +11:00
sabess
966048c0ad Adds brass knuckles. 2015-12-14 15:57:48 +11:00
Neerti
e3bf3483c8 Merge pull request #559 from Yoshax/master
Adjusts the death-whiskey
2015-12-13 21:28:09 -05:00
Neerti
24e2daa663 Merge pull request #560 from Woodratt/1.3.2_Minor_fixesnadditions
-1.3.2-
2015-12-13 21:27:52 -05:00
Neerti
2aaa4e9a5e Merge pull request #525 from Zuhayr/qol
Porting various QOL from Bay.
2015-12-13 21:25:43 -05:00
woodratt
cbb8a93451 -1.3.2-
- Fixed stripe on xenoarch outpost
- Added in a airlock for toxins to go to the toxins test site.
- Underwear closet added to visitor's laundry.
- Bar code scanner added to the library office.
- Added in missing window pane on detective's office.
- Added in chapel office shutters.
- Fixed leather jacket alt
- White Stockings added.
2015-12-13 17:36:20 -08:00
Yoshax
1eb91b3144 Adjusts the death-whiskey 2015-12-13 22:46:42 +00: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
PsiOmegaDelta
b31a5ba836 Compilation fixes. 2015-12-13 10:21:00 +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
PsiOmegaDelta
f382626075 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/asteroid.dm
	code/game/verbs/ooc.dm
	code/modules/admin/verbs/icarus.dm
	code/modules/mob/living/silicon/robot/robot_items.dm
	code/modules/projectiles/projectile/special.dm
	code/modules/random_map/random_map.dm
	code/setup.dm
2015-12-13 10:15:29 +01:00
Chinsky
911498fc32 Merge pull request #11679 from Baystation12/GinjaNinja32-patch-1
fix slime core injecting not working
2015-12-13 11:05:16 +03:00
Chinsky
939f62adc2 Merge pull request #11680 from SkyMarshal/melty-grenades
Chem grenades are no longer melted by acid.
2015-12-13 11:05:07 +03: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
Neerti
ab66a273e0 Merge pull request #541 from Mark9013100/12/11/2015detbeltandsecedits
Adds a detective belt and other edits for security
2015-12-12 23:21:52 -05:00
Neerti
0c8038f893 Merge pull request #550 from Yoshax/master
Makes the mythical special blend whiskey real
2015-12-12 23:20:35 -05:00