Commit Graph

6359 Commits

Author SHA1 Message Date
Anewbe
377e8f15c3 Merge pull request #3838 from Cameron653/master
Removes a comment
2017-09-15 17:52:11 -05:00
Cameron653
2207d55e84 owo whats this 2017-09-15 18:43:43 -04:00
Belsima
fb0e4d3cf9 General uniform updates. (#3814)
* General uniform update.

* Maps in bathrobe.

* Revert "Maps in bathrobe."

This reverts commit 9cbe47671da7a452cb5ac040aeefdcb98dbe180a.

* Fixes cheongsams and maps in the bath robe.

* Removes unintentionally added sprite.

* Assorted bugfixes.
2017-09-15 17:14:20 -05:00
Cameron653
79c5018dfa Adds medical tape to paramedic and CMO locker 2017-09-12 14:54:06 -04:00
Cameron653
d27e0092da Adds the medical tape item 2017-09-12 14:52:38 -04:00
Neerti
e7d89af8dd Removes Anti-Bird mechanisms from Defibs
For some reason, small mobs, which include Teshari and Prometheans (and monkeys) cannot use the defib unit.  They can wear the unit but can't actually 'hold' the paddles in both hands, which seems a bit inconsistent and I'd rather just remove the 'no birds allowed' code.
2017-09-11 18:42:18 -04:00
Anewbe
605fd11705 Merge pull request #3807 from Cyantime/weldtank
Fixes lit welders not igniting fuel tanks.
2017-09-11 17:23:44 -04:00
Anewbe
6ffebcef6e Merge pull request #3775 from Neerti/9/8/2017_tg_maploader_port
Port's TG's Maploader
2017-09-11 17:17:23 -04:00
Anewbe
9a1d66ede2 Merge pull request #3795 from ghost/puddlefix
Fixes some descriptions.
2017-09-10 20:41:14 -04:00
Neerti
3909524289 Merge pull request #3812 from Cyantime/delay
Adds a short delay between plushie messages.
2017-09-10 20:13:59 -04:00
Anewbe
42e8bb6284 Merge pull request #3767 from Neerti/8/10/2017_make_xenobio_old_again
Make Xenobiology Old(ish) Again
2017-09-10 17:12:38 -04:00
Cyantime
61ff20a4da Adds a short delay between plushie messages. 2017-09-10 14:16:07 -04:00
Cyantime
26b53c0ea8 Fixes lit welders not igniting fuel tanks. 2017-09-09 17:25:37 -04:00
Belsima
960e535081 Fixes some descriptions. 2017-09-08 23:09:05 -04:00
Neerti
1bc28c07c0 Port's TG's Maploader 2017-09-08 12:49:26 -04:00
Mechoid
98af877b21 Xenomorph Tweaks/Buffs. 2017-09-06 13:37:43 -07:00
Neerti
8f00965cc2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 8/10/2017_make_xenobio_old_again
# Conflicts fixed:
#	code/modules/admin/topic.dm
#	code/modules/admin/verbs/debug.dm
#	code/modules/admin/view_variables/helpers.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/transform_procs.dm
#	maps/northern_star/polaris-1.dmm
#	polaris.dme
2017-09-05 00:58:27 -04:00
Neerti
4bfcec55f2 work 2017-09-04 21:52:47 -04:00
Anewbe
9ce3c85127 Merge pull request #3762 from Mechoid/Xeno_Tyranny_Electric_Boogaloo
Brings back the aliens (With hitches).
2017-09-04 18:32:25 -04:00
Anewbe
de3016ca10 Merge pull request #3766 from MagmaRam/AI_plaque
Removes pointlessly offensive text
2017-09-04 16:16:56 -04:00
MagmaRam
f2de8d5261 ha ha, disabilities are a hilarious joke am i right 2017-09-04 11:33:53 -05:00
Anewbe
52b8d17caf Merge pull request #3752 from Woodratt/WR_Floor_type_change
Floor tile, type and carpet change
2017-09-03 17:11:39 -04:00
Anewbe
07564cbcac Merge pull request #3749 from Nalarac/Jetpack
Removes Cyborg Module Restraint on Jetpack
2017-09-03 17:09:43 -04:00
Mechoid
7de08c2420 Fix them Travis errors. 2017-09-03 13:21:05 -07:00
Mechoid
9b044309d2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Xeno_Tyranny_Electric_Boogaloo 2017-09-03 01:54:10 -07:00
Mechoid
5d390ca67b Brings back the aliens as they were when removed, minus huggers (until we can get a suitable replacement), for admins to use. 2017-09-03 01:46:08 -07:00
Andrew
d6c4d76d43 Converts dialog to use to_chat
Figured I might as well change the rest of the file while I was add it
2017-08-30 12:40:48 -05:00
Anewbe
0d607488b3 Merge pull request #3737 from Nalarac/PTools
Adds More Ways to Obtain Power Tools
2017-08-29 17:28:25 -04:00
Woodratt
0bd91d1133 Floor tile, type and carpet change
- Ports the floor types, structure, and sprites (techfloor) from Vorestation (who ported them from Eris).
- Fixed missing techfloor floortile sprite icons (ported from Eris).
- No actual new floor sprites sans the techfloor. Saving for when we actually change maps to do that.
- In theory, also added a changelog for what I'm doing. Not sure if worked.
2017-08-28 23:00:15 -07:00
Andrew
ff22f0e365 Removes Cyborg Module Restraint on Jetpack
The jetpack upgrade can now be applied to any cyborg module.
2017-08-27 22:48:31 -05:00
MagmaRam
e370d56656 Merge pull request #3710 from SpadesNeil/window-change
Weak attacks no longer can damage windows
2017-08-26 13:55:36 -06:00
Andrew
4c133ba95d Adds More Ways to Obtain Power Tools
- Added the hand drill and jaws of life to the protolathe
- Removed titanium from the hand drill and jaws of life
- Syndicate toolbox now comes with power tools
2017-08-25 20:15:09 -05:00
Belsima
5268f21321 Adds more click sounds to the game. 2017-08-23 03:16:21 -04:00
MagmaRam
499f29354a Merge pull request #3716 from Belsima/zipper
MORE ZIPPOS
2017-08-21 13:27:12 -06:00
Belsima
efac0c7e7b fuck i didnt even code the zippos in 2017-08-15 23:59:14 -04:00
Spades
8bbd131899 Better spot to do this in 2017-08-14 23:25:53 -04:00
Anewbe
ad4b439e96 Merge pull request #3680 from Neerti/8/4/2017_arrivals
Makes Arrivals Shuttle Great
2017-08-14 21:59:18 -04:00
Anewbe
d55f8b64d5 Merge pull request #3692 from PrismaticGynoid/wheelchairs
Better Wheelchairs
2017-08-14 21:57:27 -04:00
Spades
eaf2ec867d Actually let's make it 5. 2017-08-14 17:46:11 -04:00
Spades
2206b23305 If force is less than 10, an item can't damage windows. 2017-08-14 17:42:43 -04:00
PrismaticGynoid
1f1f537e1c Better Wheelchairs
Wheelchairs can now be collapsed by click-dragging them to you, much like rollerbeds. You can then pick them up. They are, however, too large to stuff into a backpack.
These new collapsible wheelchairs are now available in the loadout, under utility, for 4 points. They're also color-customizable now. No more plain white wheelchairs available only by missing feet.
The loadout wheelchairs will spawn with you buckled into them, just like how it works when you spawn without feet, except that the loadout wheelchairs can be more colors than just white.
2017-08-09 00:48:13 -07:00
Cameron653
ca4f0f2523 Update surgery_tools.dm 2017-08-08 14:00:30 -04:00
Neerti
a36313659e Removes Cloaking
Removes cloaking from the red crowbar, due to an incorrect icon var.
2017-08-05 19:46:36 -04:00
Neerti
9d98406833 Makes Arrivals Shuttle Great
Arrivals shuttle now moves automatically to and from the station.  People still spawn onboard if they join the round with arrivals selected in preferences.
The shuttle is completely automated and will go to the station if someone boards it, and leave if nobody is onboard.
Changes some tape code so it can be mapped in.
Sadly the mapmerger is broken so the map file diff is massive.
2017-08-05 15:18:55 -04:00
Anewbe
1a7d47fc6b Merge pull request #3676 from Neerti/8/3/2017_tool_update
Updates Tools
2017-08-04 14:05:06 -05:00
Neerti
4256ec902a Changes path of alien tools, adds hacking sounds, and makes the fireaxe cabinet use toolspeed. 2017-08-04 08:35:16 -04:00
Neerti
99eb6f9404 Updates Tools
Adds toolspeed var, which is a multiplier on how 'fast' the tool works.  0.5 means it goes twice as fast.
Adds usesound var, which determines what sound is used when a tool is being used.
Changes a lot of code to use those two vars instead.
Adds 'ayyy' tools, which are ported from /tg/'s abductor gamemode.  They're currently admin only but I might make them obtainable by xenoarch later.
Adds powertools, also from /tg/.  CE starts with them in a new toolbelt that spawns in their locker, ported from (you guessed it) /tg/.
Changes welder sprites to look nicer, ported yet again from /tg/.  Modified the blue welder slightly so it can be the electric welder sprite.
Adds various sounds from /tg/, for tools and welders.
2017-08-03 04:49:23 -04:00
Neerti
b2f5b758f1 Hopefully fixes merge conflicts. 2017-08-01 16:18:43 -04:00
Neerti
36b0f5fa99 Even More Circuit Changes
See PR for changes.
2017-08-01 16:13:27 -04:00
Anewbe
1888d10b23 Merge pull request #3663 from Nalarac/Robot
Modifies Illegal Equipment Module
2017-07-31 13:28:36 -05:00