cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 04:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,499 Commits 8 Branches 0 Tags
ed79946ade0b901b30e7c57b0c429a0db86bf16f
Commit Graph

297 Commits

Author SHA1 Message Date
JoanRisu
0ecd0a51be Merge branch 'master' of https://github.com/VOREStation/VOREStation into Fluff_Items_worshop 2016-12-12 18:37:33 +09:00
JoanRisu
2ca24521d9 fixing PDAs and adding squirrelkin language. 2016-12-12 18:36:12 +09:00
Kelshark
d3d7b916e0 Merge branch 'master' of https://github.com/Repede/YawnWiderStation 2016-12-11 20:04:34 -05:00
izac112
a6e2868cba Merge pull request #1 from izac112/Fluffthing 
Fixed borg resize and added Generals and Dragons Limbs
 2016-12-10 21:36:46 +01:00
killer653
0c73b9da2e Polaris December Sync 2016-12-10 09:51:11 -05:00
MagmaRam
95aa0d152d Finally got around to implementing Zuhayr's suggestion. 2016-12-06 20:16:42 -06:00
MagmaRam
c5b77fcf9e Adds an implant that allows humans to speak EAL. 
It's available in the loadout for 2 points.
 2016-12-01 22:22:46 -06:00
ForFoxSake
db63646679 Fixes language ability checks. Adds EAL to more synthetics. 2016-11-25 02:44:06 +00:00
MagmaRam
ac81408cf9 Merge pull request #2724 from Anewbe/signing 
Ports sign language
 2016-11-14 14:51:48 -06:00
Anewbe
5e9b885b43 Actually fixes the stuff 2016-11-12 11:29:23 -06:00
Anewbe
b8018065bc Ports sign language 2016-11-11 15:43:03 -06:00
Anewbe
da90b87802 Ports Bay's tape recorders 2016-11-11 00:10:55 -06:00
Eearslya Sleiarion
868413c880 Polaris Sync October 9th (#633) 2016-10-09 18:55:29 -04:00
Anewbe
c9c588b922 An Officer walks into a bar bar bar 2016-09-28 22:23:00 -05:00
Eearslya Sleiarion
7fffcaa474 Add additional language whitelists (#591) 2016-09-25 18:43:36 -04:00
killer653
d1afae6d06 Polaris Sync & bugfix 
- Polaris Sync
- Fixes bug being unable to pick up micros
- Fixes all conflicts that came with sync
 2016-08-17 22:02:05 -04:00
Cameron653
a8e133759f Emergency hotfix (#472) 
Emergency hotfix for alien whitelist
 2016-08-14 02:28:18 -04:00
Anewbe
0cb1f8c27a Cleans up the code to match recent Tajaran rewrite 2016-08-13 23:07:00 -05:00
killer653
76d549a2ed Update station_vr.dm 2016-07-08 13:36:39 -04:00
killer653
62ca476c7d Update station_vr.dm 2016-07-08 13:34:53 -04:00
Poojawa
423a010eba grammar tweak 2016-05-29 14:18:05 -05:00
Poojawa
e6368fb900 sync 2016-05-29 13:04:06 -05:00
Poojawa
8b9f6f64d0 backups applied to files 
Just to double ensure it's complaint.
 2016-05-26 09:24:18 -05:00
Arokha Sieyes
76567bb7a2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync 
# Conflicts:
#	code/modules/mob/living/carbon/human/whisper.dm

Whisper modified locally, and deleted upstream (in a change I made, so I know it's safe to remove).
 2016-05-26 09:59:18 -04:00
HarpyEagle
2bb73a3861 Fixes bad default whisper_verb 
Doesn't do anything other than cause the text "whispers" to be used for pretty much
every other language even when it should not be.
 2016-05-25 00:26:14 -04:00
Poojawa
6d13e6adea Code Standards applied 
Was half asleep and just copy/pasting most of that, oops.
 2016-05-24 01:22:48 -05:00
Poojawa
4ec6aab681 Vulpkanin 
Ported from Paradise, should be a bit better than the old fox sprites
taken from Citadel.
 2016-05-23 16:08:01 -05:00
Arokha Sieyes
d7e65b22ba Merge branch 'master' of https://github.com/VOREStation/Polaris into sync 2016-05-16 18:31:38 -04:00
ParadoxSpace
48ab0fbc57 Gives Cult Cultist Language (Again) (#1651) 
* Spooky Speak 2.0
 2016-05-15 18:32:31 -04:00
Neerti
d1d4101ed2 Merge pull request #1648 from ParadoxSpace/Hissing2.0 
Enhances Unathi Language
 2016-05-15 18:27:18 -04:00
ParadoxSpace
76d9cfb510 Update station.dm 2016-05-13 15:39:03 -06:00
Arokha Sieyes
7d81860c6f Almost done with species 
Just needs ears for sergals defined

Also commented out processing stomach on life() because that's silly stock
stuff
 2016-05-10 21:06:35 -04:00
Datraen
7a92283cac Fixes an OOP issue. 2016-05-01 15:34:25 -04:00
Datraen
81b638afc5 Adds a check for can_speak to prevent a null language from being spoken. 2016-05-01 15:08:27 -04:00
Datraen
fe9d3fd4c4 Merge pull request #1027 from Kelenius/mobCleanup 
Changes types of ghosts and eyes
 2016-03-18 13:50:47 -04:00
Kelenius
acc78a8000 Changes types of ghosts and eyes 
``/mob/dead/observer`` -> ``/mob/observer/dead``
``/mob/eye`` -> ``/mob/observer/eye``

Reason being that they are similar in that they both don't interact with
the world in any way. Some procs were shared, some checks as well, and
it overall makes more sense this way. Plus, there were no ``/mob/dead``
mobs.
 2016-02-20 15:36:05 +03:00
Zuhayr
cbc506fd51 Removed xenomorphs. 2016-02-20 11:50:18 +10:30
Zuhayr
a628ae2a56 Removed the Vox Pox. 2016-02-20 11:24:19 +10:30
Zuhayr
19014807fd Surface rename of Seromi to Teshari. 2016-02-06 12:50:16 +10:30
Zuhayr
58736fb4f6 Renaming Resomi to Seromi. 2016-01-27 14:24:09 +10:30
Zuhayr
eef9145486 Revert "Removes Resomi." 
This reverts commit c9f579e00a.
 2016-01-27 13:48:48 +10:30
Zuhayr
887c174926 Fixes #260 2016-01-14 00:17:50 +10:30
Zuhayr
f93ea6a78f Tweaks to previous commits. 
More tweaks to IPC fixes.
Merge resolution/compile fixes.

Further work on properly integrating, updating and fixing prosthetic options.

Repathed internal organs to organ/internal.

More work on full synthetics, changelings, overheating.

Working on getting organs to qdel properly and spawn properly when robotized.

Finalized some overheating values, added remaining prosthetic icons.

Finalizing the testing version of the full prosthetic bodies branch.

Added suit cyclers to the autolathe and map.

Fixing runtime errors.

Fixing errors.

Changelog.

Replacing limb and organ strings with constants.

Prevented brainless species from becoming full cyborgs.

Fixed issues with brain/MMIs renaming themselves inappropriately.

Various fixes and oversights.
 2015-12-24 21:13:40 +10:30
Zuhayr
d71573e749 Further work on properly integrating, updating and fixing prosthetic options. 
WIP
Allowed heads/bodies to be prosthetic. Removed IPC. Refactored some flags.
 2015-12-24 21:10:33 +10:30
Zuhayr
c9f579e00a Removes Resomi. 2015-12-21 09:56:11 +10:30
Neerti
4f77afece1 Revert 58ef59734f 2015-11-08 10:09:14 -05:00
PsiOmegaDelta
b1fe5e3eab Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/antagonist/outsider/ert.dm
 2015-11-06 17:50:34 +01:00
PsiOmegaDelta
e81f42840a Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/human/species/station/station.dm
 2015-11-06 17:43:05 +01:00
PsiOmegaDelta
73f99a4c01 Secondary diona nymphs now get non-restricted/whitelisted languages on split. 2015-11-05 10:04:00 +01:00
PsiOmegaDelta
daa9b0e0bc When a diona splits, the main nymph inherits all known languages. 
Fixes #11401.
 2015-11-04 17:50:51 +01:00