Commit Graph

4029 Commits

Author SHA1 Message Date
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
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
Neerti
3909524289 Merge pull request #3812 from Cyantime/delay
Adds a short delay between plushie messages.
2017-09-10 20:13:59 -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
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
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
Spades
a55d4c5e4c Imperial Military Update
Adds Imperial stuff for our space elf romans.
2017-09-02 04:07:25 -04: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
Funce
87a68e40d8 Emagging lift doors should no longer be a thing 2017-08-30 13:54:45 +12: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
killer653
cafac8efae Polaris Sync 2017-08-28 20:52:11 -04: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
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
Ketrai
4546f5cc9a Updated contraband crate
Added the contraband you can get from trash piles, re-added phazon pieces.
2017-08-22 23:00:43 +02:00
Ketrai
20250d76e1 Updated stolen supplies
Removes the majority of phazon pieces. (getting the full set has an extremely tiny number of succeeding, and you can't get the circuit board anyways. I kept one so people know it still exists.) Adds high tier contraband you can find in trash piles to give an alternative way to obtain these. Hopefully encourages more people to mine to get points and resources for science. If you feel this isn't balanced enough, can always increase the probability of getting cosmetic or lesser items to dilute the pool.
2017-08-22 13:13:57 +02: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
Anewbe
ad4b439e96 Merge pull request #3680 from Neerti/8/4/2017_arrivals
Makes Arrivals Shuttle Great
2017-08-14 21:59:18 -04:00
Spades
9b8cc501bd Merge pull request #1955 from Verkister/blehh2sparkbooger
Another small saddlebag fix.
2017-08-09 00:54:01 -04:00
Verkister
c72893c0f7 Noticed a case thing and i ain't taking chances this late.
-I'm already asleep it's not even me typing this shit right now.
2017-08-09 02:19:17 +03:00
Verkister
1b3732f11f Another small saddlebag fix.
-Figured out why saddlebags weren't showing up on subtype taurs.
-Something something spaghrtti and now the iconstate sets accordingly to the main type name instead of subtype name.
-I really need to sleep this is my last second awake tonight and hopefully this works?
2017-08-09 02:12:12 +03:00
JOAN-RIG\Joan Risu
02e8dc62bd Merge branch 'master' of https://github.com/VOREStation/VOREStation into Fluff_Items_worshop 2017-08-08 14:56:29 -07:00
killer653
8e42ab0ca1 Merge remote-tracking branch 'PolarisSS13/master' into POL_SYNC 2017-08-08 16:10:47 -04:00
Cameron653
ca4f0f2523 Update surgery_tools.dm 2017-08-08 14:00:30 -04:00
killer653
468e73c7f3 Polaris sync 2017-08-06 19:07:17 -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
Andrew
09f0ca8c81 Fixes description of upgrade
adds of
2017-07-30 15:48:30 -05:00
Andrew
36e4adaf8f Modifies Illegal Equipment Module
+Illegal equipment module now scrambled equipment module
+Scrambled equipment module now unlocks emagged borg items without
actually emagging the borg, allowing for AI sync, law updates, and being
emagged.
+Makes the miner borg diamond drill appear in all cases of being
upgraded or emagged instead of only if emagged while the mining module
is equipped.

Changelog includes all my previous PRs as well for ease of access to the
changes by the general public. I can trim it down to just this PR if
requested.
2017-07-29 17:32:33 -05:00
silveryferret
786c21c66e Fixes build_path variable, tweaks required components for R-UST parts, adds supply packs for R-UST things 2017-07-29 05:26:07 -04:00
LorenLuke
31e90bfeed Adds Collapsible AM rifle. Createes new uplink entry (#3644)
* Adds Collapsible AM rifle, and adds case with parts and 5 shots to Uplink. Separates it and intended merc version, both costing default telecrystal amount. Does NOT make them antagonist type specific.

* Addresses review.

* Makes rifle case traitor/merc specific. Enables ability to have specific uplink items be available only for specific antags.
2017-07-28 16:06:20 -05:00
HawkerTheGreat
7695e45e3a Path Fix
Last Issue, I swear to god, I will get sleep tonight.
2017-07-26 03:56:48 -05:00
HawkerTheGreat
a52af2947e Vox Phoron Tank Sprites Suddenly Missing 2017-07-26 03:33:02 -05:00
Anewbe
31bc1f757f Merge pull request #3635 from LorenLuke/Bomb-Consistency
Tank/TTV Consistency improvement
2017-07-25 16:44:45 -05:00