Commit Graph

6655 Commits

Author SHA1 Message Date
Spades
d5b39e97c3 Trash pile tweaks
- Adds zip gun
- Removes dart gun (I don't know what this even does)
- Adds voice changer mask
- Removes vault moneybag (glitchy)
- Adds makeshift metal armor
- Removes press armor (confusing for SOP)
2017-09-18 03:18:23 -04:00
Cyantime
68056dd5f2 Deconflict 2017-09-16 19:00:30 -04:00
Cyantime
49a62057c3 Constructability. 2017-09-15 21:52:35 -04:00
killer653
bddfa16f82 Polaris sync 2017-09-15 21:17:34 -04:00
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
Spades
bdf5ce72f8 Merge pull request #2132 from Ketrai/master
adds new event... solargrubs
2017-09-13 16:09:19 -04:00
Spades
3a89fa8f4e Merge pull request #2157 from Cameron653/TRASH_PILE_ADJ
Trash pile adjustments
2017-09-13 16:08:14 -04:00
killer653
794c1c2b67 Removes 2 useless items. Fixes indents on one. 2017-09-12 18:59:43 -04:00
Cyantime
6ee2ec7c81 Fixes mouse spawners 2017-09-12 18:14:15 -04: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
Spades
4f7c6bb4ac Fixes #2138 2017-09-09 23:04:25 -04:00
Spades
8e3ada6721 Revert "Removes silly railing layering" 2017-09-09 22:44:12 -04:00
Cyantime
26b53c0ea8 Fixes lit welders not igniting fuel tanks. 2017-09-09 17:25:37 -04:00
Ketrai
3da219cf8e grublarba 2017-09-09 22:38:54 +02:00
Ketrai
d595871114 derp 2017-09-09 22:38:15 +02:00
Ketrai
a8d8f35ae6 grubs make larva 2017-09-09 22:25:33 +02:00
Spades
6eb472f31d Revert "Adds a new event - Solargrubs!" 2017-09-09 12:24:37 -04:00
Spades
6038c0a81f Merge pull request #2108 from Ketrai/master
Adds a new event - Solargrubs!
2017-09-09 12:24:26 -04:00
Belsima
960e535081 Fixes some descriptions. 2017-09-08 23:09:05 -04:00
Spades
8773cc389a Removes silly railing layering 2017-09-08 21:27:31 -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
Ketrai
0c8a2796ff adds spider_vr.dm
tiny bit of code to do everything they have to do.
2017-09-06 10:45:43 +02:00
Ketrai
c62245353b delete grub_vr.dm
making spider_vr.dm instead
2017-09-06 10:44:53 +02:00
Ketrai
d32c6f07a9 undoes the edit
Cutting down the code confuses the hell out of the event, it refuses to spawn the grub larva otherwise.
2017-09-05 21:56:28 +02:00
Ketrai
ad3cabfca8 cuts down inherited code
This should cut down code that was inherited from effects/spider
2017-09-05 21:16:45 +02:00
Ketrai
31959bef22 travis random crash
UGH
2017-09-05 18:17:30 +02:00
Ketrai
03196646a9 adds solargrub to predator crate
coz whynot, we got carp in there
2017-09-05 16:15:03 +02:00
Ketrai
46279ff41e adds an effect file for grubs
So they can grow similar to spiderlings
2017-09-05 16:06:26 +02: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
Spades
a55d4c5e4c Imperial Military Update
Adds Imperial stuff for our space elf romans.
2017-09-02 04:07:25 -04:00