cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-04 05:08:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,125 Commits 9 Branches 26 Tags
bb6efa131dcbba4aed65369f6edb9b5ade2bb339
Commit Graph

1488 Commits

Author SHA1 Message Date
Anewbe
bb6efa131d Merge branch 'master' of https://github.com/PolarisSS13/Polaris into costumes 2017-10-14 02:19:29 -05:00
Anewbe
0741b45570 Adds costumes, improves admin outfit verb 2017-10-14 02:19:13 -05:00
Anewbe
f57fe381f8 Minor outfit tweaks 2017-10-13 10:41:08 -05:00
Neerti
a8513844ec Adds a Trait system (#4048) 
* Works on trait system, wip.

* Finalizes traits.
Fixes a few bugs with medical machines assuming a max health of 100.
 2017-10-13 01:17:39 -05:00
Anewbe
cf6b558be8 Corrects security ids 2017-10-12 17:44:51 -05:00
Anewbe
069adbb538 Ids should have accounts now 2017-10-12 17:01:20 -05:00
Anewbe
152cf3362c Finishing touches on outfit code 2017-10-04 21:55:55 -05:00
Anewbe
10b0264c6a Yet more work on the Outfit System 2017-10-04 20:05:20 -05:00
Anewbe
cf9245b5fb More work on outfits 2017-10-04 11:49:24 -05:00
Anewbe
094df467a9 Continues work on Outfits 2017-10-04 01:14:09 -05:00
Anewbe
2fde466a21 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into outfits 2017-10-03 23:24:12 -05:00
Neerti
cf263e348e Merge pull request #3981 from Anewbe/gravetender 
Adds the gravekeeper lost borg module
 2017-10-03 23:01:15 -04:00
Anewbe
d0a22df9c3 Continues work on outfits 2017-10-01 20:50:30 -05:00
Anewbe
1b7ecf6789 Ports Bay's outfit system 2017-10-01 02:31:37 -05:00
Anewbe
d067f70403 Adds the thing that spawns the gravekeeper drone 2017-09-30 02:00:10 -05:00
Anewbe
efa89a9650 Splits the robot_modules file. Continues work on gravekeeper drone. 2017-09-29 01:02:53 -05:00
Anewbe
20c5e31c3b Adds the gravekeeper lost borg module 2017-09-28 22:21:09 -05:00
Anewbe
47f2854bb7 Makes the scythe a child of fireaxes, adds it to the weed control crate 2017-09-26 22:15:33 -05:00
Anewbe
c80b535a29 Merge pull request #3902 from Neerti/9/19/2017_lost_drone 
Adds the Lost Drone
 2017-09-22 15:24:05 -05:00
Neerti
afd7b15442 Adds the Lost Drone 2017-09-22 01:17:53 -04:00
Belsima
c67865ac63 Adds a load of new FBPs. (#3850) 
* Adds a load of new FBPs.

* Replaces cyber solutions sprites.

* Fixes and price adjustments.

* Revert "Fixes and price adjustments."

This reverts commit d56c3f082e9301b80970f62aa9d0cb3e8cfc6d8f.

* Fixes + supply price adjustments.

This time without... for some reason adding an empty line to the map
files. Not sure how that got caught by Git.

* Makes the new knockoffs into alternatives for the currently existing brands.

* new names
 2017-09-20 22:02:18 -05: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
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
Belsima
7665588e4e Adds a tiedye shirt. 2017-08-23 03:38:48 -04:00
MagmaRam
1546b25f4c Merge pull request #3698 from Belsima/fbps 
Adds Grayson Manufactories FBPs.
 2017-08-20 21:27:50 -06:00
Anewbe
676fb6daf6 Merge pull request #3694 from SpadesNeil/gun-stuff 
Gun stuff. Some fixes, some changes, and a shiny new SVD
 2017-08-20 11:21:50 -04:00
Neerti
e209c2c707 Merge pull request #3717 from Cyantime/cheaperteg 
Reduces TEG price.
 2017-08-17 11:52:29 -04:00
Cyantime
80ec86a07c Reduces TEG price. 2017-08-16 10:50:10 -04:00
Belsima
31f9127cf9 Adds Grayson Manufactories FBPs. 2017-08-10 14:38:33 -04:00
Spades
6b02206adf Sniper Changes and Fixes 
- Fixes the heavy sniper hand sprite so it no longer looks like a
pistol. Not ideal, but better.
- Changes energy sniper to use the Z8's hand sprite, because it's more
distinct than looking the same as the laser carbine.
- Adds the SVD back by request of Woodrat. It's not spawnable yet, since
I don't know where you want to balance it.
 2017-08-09 21:04:58 -04:00
Neerti
01856579d1 Merge pull request #3681 from LorenLuke/Antag-fix 
Allows team traitor and autotraitor to order AM rifle.
 2017-08-05 19:39:31 -04:00
LorenLuke
f3b2ddd80c Fixes typo. 2017-08-05 15:28:42 -07:00
LorenLuke
36b0d0bfcc Allows team traitor and uato traitor to order AM rifle. 2017-08-05 15:06:20 -07: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
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
LorenLuke
2f481de07d Bugfix. 2017-07-30 22:51:03 -07: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
MagmaRam
ded94ef66c Merge pull request #3643 from Anewbe/monkey_cubes 
Adds monkey cubes to the traitor uplink
 2017-07-28 15:18:30 -05:00
Cameron653
97957fcaee Replaces more macros. (#3647) 
* MORE MACRO CHANGES

AHHHHHHHHHHHHHHHHHHHH

* Fixes a few typos

* Fixes compile error

* Fixes for real

* 4 macros left that I can't find
 2017-07-27 21:12:21 -05:00
Anewbe
c3945440c6 Adds monkey cubes to the traitor uplink 2017-07-25 17:55:02 -05:00
Anewbe
f0d9bb5dce Adds the weapon swaps to the uplink 2017-07-22 15:01:18 -05:00
Anewbe
ab5e716624 Merge pull request #3617 from SpadesNeil/centcom-not-centcomm 
CentCom not centcomm
 2017-07-22 13:30:06 -05:00
Spades
7e4417d31f It's CentCOM not CentCOMM 
I swear to god I have fixed this like three times already and somehow it
keeps coming back.
 2017-07-21 04:29:39 -04:00
Spades
2e776ac645 Changes 5.56mm to 5.45mm, now 20% less stupid 
The same as https://github.com/PolarisSS13/Polaris/pull/3612 except this
time I'm not a dumbass and accidentally overwriting other changes
because the Github client decided not to sync with Polaris.
 2017-07-19 14:24:50 -04:00
Anewbe
27284d3687 Merge pull request #3577 from Anewbe/shotgun_fix 
Fixes slugs being available in an unhacked autolathe
 2017-07-12 23:17:54 -05:00
Anewbe
be8c644e07 Merge pull request #3565 from Neerti/7/6/2017_jammers 
Adds Radio Jammers to Traitor Uplink
 2017-07-09 16:15:42 -05:00