cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 12:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,766 Commits 8 Branches 0 Tags
ba36df71a7657bf6656c7b19f81b51e5b27875dc
Commit Graph

1455 Commits

Author SHA1 Message Date
Yoshax
1fc10eaddb Adjusts surplus crates 2016-07-23 21:15:44 +01:00
Yoshax
305255d2ee Adjusts uplink item costs 2016-07-23 21:00:53 +01:00
Yoshax
93b7e661c4 Ensures contraband for supply computers can be properly acquired via hacking 2016-07-23 20:24:04 +01:00
Yoshax
fcf34eb54b Puts a couple of crates into the right file 2016-07-23 20:08:24 +01:00
Yoshax
b5d85c7d71 Converts the empty box supply crate into a shipping supplies crate 2016-07-23 20:05:59 +01:00
EmperorJon
a94cad7a59 Merge pull request #2168 from Yoshax/telecrystals 
Multiplies all Telecrystal stuff by ten to setup for fine cost adjusting
 2016-07-22 19:34:08 +01:00
EmperorJon
68f83c3c9e Merge pull request #2163 from Neerti/7/22/2016_ghost_texting 
Communicator Texting for Ghosts
 2016-07-22 19:33:46 +01:00
Neerti
ae497b0dd8 Communicator Texting for Ghosts 
Ghosts can now text communicators in round, and can be texted by those back.
This is obviously logged, just in-case funny business occurs.
Adds verbs to display a log of messages that a ghost has sent and received, as well as a verb to send a message to a communicator of their choice.
 2016-07-22 12:51:00 -04:00
Yoshax
21f856ed47 Multiplies all Telecrystal stuff by ten to setup for fine cost adjusting 2016-07-22 17:35:20 +01:00
Cameron653
a84afa6e99 Fixes a typo preventing field gens from being bought. 2016-07-21 17:03:15 -04:00
Mark9013100
8e7b2e8fe0 Removes the HoS trench from the security uniform crate 2016-07-19 21:45:44 -04:00
Anewbe
1f4ca8dbd0 Removes Assault Carbine from uplink 2016-07-10 04:14:42 -05:00
Yoshax
04e664ca36 Makes cargo datums and shuttle use fifty stacks for material, removes snowflake amount code and var 2016-07-10 03:49:16 +01:00
Arokha Sieyes
484fb96202 Merge branch 'master' of https://github.com/PolarisSS13/Polaris 
# Conflicts:
#	.travis.yml
#	code/game/machinery/adv_med.dm
#	code/modules/mob/mob.dm
 2016-07-03 16:21:21 -04:00
Datraen
ccda51ab68 Adds fluff antag factions, antag visibility options for uplinks. 
No mechanical changes come of this change, only the ability to have an antagonist faction, as well as having specified visbility for the affiliation itself.
Also adds Skrell home system to the home system list.
 2016-06-29 11:25:52 -04:00
Yoshax
7baa3face9 Adjusts and attempts to normalize cargo costs 2016-06-27 19:32:46 +01:00
Yoshax
0eab5e4b80 Adds missing cargo categories 2016-06-20 18:47:24 +01:00
Yoshax
6cb89d4d77 Makes costumes category not borked 2016-06-16 18:50:00 +01:00
Arokha Sieyes
3809e30a07 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync 
# Conflicts:
#	code/datums/supplypacks/science.dm
 2016-06-14 21:09:38 -04:00
Arokha Sieyes
cb65295059 Fixes issues with update: 
Replaces glass boxes on map with new path
Removes duplicate code accepted into Polaris
Moves supplypacks_vr to science_vr
 2016-06-14 15:01:37 -04:00
Yoshax
9e79e35964 Makes science group not security 2016-06-13 22:55:30 +01:00
Arokha Sieyes
878cf928f8 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync 
# Conflicts:
#	.travis.yml
#	vorestation.dme
 2016-06-13 13:12:40 -04:00
Yoshax
0cbade2d98 Adjusts cargo categories 2016-06-11 20:18:53 +01:00
Datraen
6984008bca Splits supplypacks.dm into categorized files, adds subtyping. 2016-06-11 12:13:40 -04:00
Datraen
299059a5be Merge pull request #1883 from Yoshax/drinks 
Ports GinjaNinja32's drinks rewrite from Bay
 2016-06-10 23:08:41 -04:00
Anewbe
c01a44f892 Adds more fishnet 2016-06-10 18:09:48 -05:00
Datraen
5c97cede59 Brings vending machine datums under a subtype of smartfridge datums. 2016-06-10 01:41:59 -04:00
Arokha Sieyes
eb6f979fc0 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync 
# Conflicts:
#	vorestation.dme
 2016-06-07 18:37:47 -04:00
Spades
e51da6c35b Renamed SVD mag to be consistent per request. 
It's just a 10 round 762 magazine. It's compatible with the STS.
 2016-06-06 22:03:03 -04:00
GinjaNinja32
debfd3dabf Ports GinjaNinja32's drinks rewrite from Bay 2016-06-06 20:33:11 +01:00
Cameron653
35301d3d9c Adds in new prosthetic build 2016-06-05 22:41:02 -04:00
Spades
15f555b0fa Okay I lied. One more commit before a dev sees. 
Soviets aren't in your lore.
 2016-06-03 21:07:56 -04:00
Spades
a063c8915e Feedback based on meeting. 
- Removed carbine from the cargo.
- Removed SVD.
- Removed FiveSeven. Added sprite to gun resprites.
 2016-06-03 20:21:12 -04:00
Spades
dd0c3935e7 Gun lore updates. 
Also changed the path of the bullpup rifle.
 2016-06-03 10:33:04 -04:00
Spades
c6b650afa5 Changed some new gun names based on feedback. 
People prefer fantasy names for modern guns! Left names like the Mosin
and Tommygun because they're too ironic to change, even in the 26th
century.
 2016-06-02 17:16:21 -04:00
Spades
736c8c132c Merge remote-tracking branch 'refs/remotes/PolarisSS13/master' into GunsGunsGuns 2016-06-02 13:01:45 -04:00
Yoshax
f75d509e7f Ports event system from Bay 2016-06-01 22:05:04 +01:00
Spades
ff87150c3d Let's just have the one commit this time because I'm no longer paranoid of losing progress. 2016-06-01 12:48:48 -04:00
Arokha Sieyes
925b1b4a3e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync 
# Conflicts:
#	code/game/mecha/mech_fabricator.dm
 2016-05-31 18:17:58 -04:00
Datraen
36d9cee0f7 Merge pull request #1806 from VOREStation/limbprinter 
Make FBPs Constructable
 2016-05-31 15:50:32 -04:00
Leshana
eae29b9d69 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sink 2016-05-30 22:43:05 -04:00
EmperorJon
741706e9e3 Underwear + setup merges (#1812) 
* Manually merges 12595 and 12461.

* Moron Jon 2: Moron Boogaloo

* Makes Yosh happier
 2016-05-30 19:19:45 +01:00
Arokha Sieyes
05f8a69821 Make FBPs Constructable 
Print 'em out, slap an MMI or Posibrain in. They come from a new machine, the Prosthetics Fabricator. You can order license discs from cargo to print the proprietary limbs. Making FBPs requires a bit of research as well, otherwise you only get arms/legs. Also requires a bit of plasteel to make the critical parts. Mostly just need every limb, plus eyes. Torso comes with the snowflakey FBP battery.

Also adds an FBP 'self-diagnostics' verb. More vague than an analyzer.

**This adds a machine that needs to be placed on the map. "/obj/machinery/pros_fabricator"**

Personally, I would replace the right-side exosuit fab with it. I can add this to my PR but I'm unsure how you guys feel about non-devs submitting map changes.
 2016-05-30 02:13:55 -04:00
Leshana
e004a8bfc0 Merge remote-tracking branch 'polaris/master' into sink 
# Conflicts:
#	code/_onclick/item_attack.dm
#	code/modules/client/preferences.dm
#	code/modules/mob/living/carbon/human/examine.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
#	code/modules/mob/new_player/preferences_setup.dm
#	nano/images/nanomap_z1.png
#	vorestation.dme
 2016-05-29 16:22:07 -04:00
EmperorJon
5a545854a4 Underwear Datums (#1794) 
* One more step to bringing our preferences/setup stuff in line with Bay.

* Whoopsy

* Jon is a moron, more at 11.
 2016-05-29 17:29:36 +01:00
Mark9013100
41de641287 Adds blue carpet stack 2016-05-27 22:34:35 -04:00
GinjaNinja32
beee32f237 Allow disabling styling of fake nanoui windows 2016-05-26 18:07:38 +01:00
Arokha Sieyes
8230732453 Merge branch 'sync' of https://github.com/VOREStation/Polaris into 05192016_sync 2016-05-19 23:52:00 -04:00
Neerti
95f49d0dff Merge pull request #1697 from Yoshax/medicalkitfix 
Fixes combat medical kit being unbuyable
 2016-05-19 14:30:31 -04:00
SinTwo
a87c8de3fd HTML5 and CSS3 (#1677) 
* Updates to HTML5 and CSS3

* UI Tweaks and Fixes
 2016-05-19 14:28:38 -04:00