cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 12:43:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,372 Commits 8 Branches 0 Tags
f54dd94a66e5d94975d0b51ec20655c5e165ca22
Commit Graph

32 Commits

Author SHA1 Message Date
Chinsky
939c1a3146 Merge pull request #11376 from NullSnapshot/dev-freeze 
Bunch of IPC fixes.
 2015-12-04 11:28:25 +03:00
Zuhayr
5561964204 Tweaks to previous commits. 2015-12-03 22:56:19 -08: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
NullSnapshot
e5ca86c168 fixes random name EAL naming thing... again. 2015-10-25 17:40:34 -07:00
PsiOmegaDelta
c5d8fbfd57 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/antagonist/alien/borer.dm
	code/modules/mob/living/living_defense.dm
 2015-10-07 08:07:23 +02:00
PsiOmegaDelta
bbcadcc080 Makes silicon language handling more robust. 
Also fixes an issue with lists being targets for qdel(). Fixes #11221.
 2015-10-05 11:21:09 +02:00
PsiOmega
69fde6af03 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/antagonist/alien/borer.dm
	code/game/gamemodes/game_mode.dm
	code/game/gamemodes/nuclear/nuclear.dm
	code/game/gamemodes/traitor/traitor.dm
	code/game/objects/items/robot/robot_parts.dm
	code/setup.dm
 2015-09-05 09:24:30 +02:00
Chinsky
9728f28880 Merge pull request #10843 from PsiOmegaDelta/150924-CultSpeech 
Relocates Cult/Occult languages to unused keys.
 2015-09-03 20:37:16 +03:00
Zuhayr
14c57fcf11 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/modules/mob/holder.dm
	icons/mob/head.dmi
 2015-08-31 16:17:24 +09:30
Zuhayr
ac04bdfb52 Readded monkey scooping. 
Conflicts:
	code/modules/mob/living/carbon/human/species/species.dm
 2015-08-31 07:01:56 +09:30
PsiOmegaDelta
57465d0dfb Tries to relocate Cult/Occult languages to unused keys. 
Now uses f and y. Fixes #10799.
 2015-08-24 17:35:56 +02:00
PsiOmega
3a08e2884a Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/structures/crates_lockers/largecrate.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/research/circuitprinter.dm
 2015-08-15 10:52:17 +02:00
GinjaNinja32
2847c08b77 Fix not being able to select Siik'tajr or Sinta'unathi as default via Check-Known-Languages 2015-08-14 21:30:09 +01:00
PsiOmega
f8d86900a5 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/new_player/preferences_setup.dm
	code/setup.dm
 2015-08-01 19:45:42 +02:00
Zuhayr
840b5b756b Fixes #10358, #10359 and #10257 2015-08-01 23:17:27 +09:30
PsiOmega
0a05c2659f All the span-corrected dm files. 2015-06-14 22:08:14 +02:00
PsiOmega
57f0a3535c Observers can now only follow hivespeech as long as the speaker uses its real identity or antagHUD is enabled. 2015-06-12 17:19:29 +02:00
PsiOmegaDelta
8c7cbeb093 Ghosts can now follow hivemind speech. 
Ghosts can now follow hivemind speech with the same targets as for normal speech (separate links for mob and eye if any, etc.).
 2015-06-12 15:00:53 +02:00
PsiOmegaDelta
75cffd60aa Merge pull request #9780 from Baystation12/dev-freeze 
Dev
 2015-06-10 11:15:45 +02:00
mwerezak
58d512d1e6 Fixes tajaran name generation, tweaks 2015-06-10 00:53:24 -04:00
Zuhayr
7dd86c9147 Readded preview icon for IPC, added language and blurb. 
Added welder/fuel checks to relevant surgery.
 2015-05-25 14:50:00 +09:30
GinjaNinja32
6699cab7bf Adds selectable default languages to all mobs which can speak 
Set-Default-Language verb to set, Check-Default-Language verb to check
There are also links to set and reset in Check-Known-Languages
 2015-04-08 15:18:59 +01:00
=
601e6fb7ef Merged with dev. 2015-03-31 11:17:13 +10:30
PsiOmega
1a000b0e0f Merge remote-tracking branch 'upstream/dev' into NarsiePort 
Conflicts:
	code/modules/mob/living/carbon/human/say.dm
 2015-03-29 13:04:53 +02:00
PsiOmega
464d702d4b Mob refactoring. 
Updates Bump() code.
Intents now use constants.
Simple animals can now use languages without overriding say().
There is now a difference between being able to smash normal and reinforced walls.
Reworks simple_animal/attackby so that constructs don't need to override it simply to add damage resistance.
 2015-03-29 10:44:31 +02:00
Zuhayr
aa6439096c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into limbs 2015-03-26 23:25:26 +10:30
Zuhayr
efa6f0d3c9 Finalized monkey species definitions and icons. 2015-03-26 14:45:41 +10:30
Zuhayr
e0f23aead5 Collapsed all organs into one object type. Added more interesting amputation. Added dislocation. WIP. 2015-03-11 21:17:51 +10:30
Zuhayr
b3bae8a509 Split language.dm across multiple files. 2015-03-01 02:01:43 +10:30
Zuhayr
e2f69bd6cd Moves language.dm into its own folder. 2015-03-01 02:01:37 +10:30